Permalink
Browse files

Ribbon

1 parent e4a5b43 commit 9a049171a0bb979cb79ae0e59cd9983070cce291 @quicklizard99 quicklizard99 committed May 27, 2016
@@ -1,8 +1,7 @@
-STYLESHEET = """
QWidget {
background: #2e2e2e;
color: #dddddd;
- border: 1px solid #5a5a5a;
+ border: 0;
padding: 0;
margin: 0;
font-family: Arial;
@@ -27,13 +26,13 @@
}
QAbstractItemView {
- border: none;
- background-color: #8f8e93;
+ border: 1px solid black;
+ background: #8f8e93;
}
QGraphicsView {
- border: none;
- background-color: #8f8e93;
+ border: 1px solid black;
+ background: #8f8e93;
}
QLabel {
@@ -47,22 +46,23 @@
QRadioButton::indicator {
border: 2px solid #3a3939;
border-radius: 6px;
- background-color: white;
+ background: white;
width: 10px;
height: 10px;
margin-left: 5px;
}
QRadioButton::indicator:checked {
- background-color: #8d20ae;
+ background: #8d20ae;
}
QRadioButton::indicator:disabled {
- background-color: #3e3e3e;
+ background: #3e3e3e;
}
QStatusBar {
border: none;
+ border-top: 1px solid #5a5a5a;
}
QStatusBar QWidget {
@@ -145,7 +145,8 @@
subcontrol-position: top;
}
-QScrollBar:left-arrow, QScrollBar::right-arrow, QScrollBar::up-arrow, QScrollBar::down-arrow {
+QScrollBar:left-arrow, QScrollBar::right-arrow,
+QScrollBar::up-arrow, QScrollBar::down-arrow {
border: 1px solid #5A5A5A;
width: 3px;
height: 3px;
@@ -171,6 +172,10 @@
border: 1px solid #5A5A5A;
}
+QSplitter {
+ border-top: 1px solid #5a5a5a;
+}
+
/* No image for splitter handle */
QSplitter::handle:horizontal {
image: none;
@@ -181,7 +186,7 @@
}
QSplitter::handle:horizontal:hover {
- background-color: #5b5b5b;
+ background: #5b5b5b;
}
QProgressBar {
@@ -190,28 +195,29 @@
QProgressBar::chunk {
width: 1px;
- background-color: #8d20ae;
+ background: #8d20ae;
}
QSlider {
border: 0;
+ margin: 2px;
}
QSlider::handle:horizontal {
width: 10px;
- background-color: #dddddd;
+ background: #dddddd;
border-radius: 3px;
/* -ve vertical margins to get handle to protude beyond groove */
margin-top: -4px;
margin-bottom: -4px;
}
QSlider::handle:horizontal:hover {
- background-color: white;
+ background: white;
}
QSlider::handle:horizontal:disabled {
- background-color: #aaaaaa;
+ background: #aaaaaa;
}
QSlider::groove:horizontal {
@@ -234,22 +240,22 @@
QPushButton:hover {
color: white;
- background-color: #5b5b5b;
+ background: #5b5b5b;
}
QPushButton:default {
color: white;
- background-color: #8d20ae;
+ background: #8d20ae;
border: white;
}
QComboBox:selected {
color: white;
- background-color: #5b5b5b;
+ background: #5b5b5b;
}
QMenu {
- background-color: #4f4f4f;
+ background: #4f4f4f;
}
QMenu::item {
@@ -278,69 +284,43 @@
QMenu::item::disabled {
color: gray;
- background-color: #4f4f4f;
+ background: #4f4f4f;
}
/* To get menu bar appearing correctly on Windows
See https://bugreports.qt.io/browse/QTBUG-49115
*/
-QMenuBar , QMenuBar::item {
+QMenuBar, QMenuBar::item {
background: transparent;
}
-QTabWidget::tab-bar {
- position: absolute;
- left: 0;
-}
-
-QTabBar {
- font-size: 17pt;
- margin-left: 2px;
- border: 0;
-}
-
-QTabBar::tab {
- padding: 8px;
- margin: 0;
- border: 0;
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
-}
-
-QTabBar::tab:selected {
- margin: 0;
- color: white;
- background-color: #5b5b5b;
-}
-
-QTabBar::tab:hover {
- color: white;
- background-color: #5b5b5b;
-}
-
-QTabWidget::pane {
- border: none;
+QMenuBar {
+ padding-bottom: 2px;
+ border-bottom: 1px solid #dddddd;
}
QToolBar {
padding: 0;
border: 0;
margin: 0;
-}
-
-QToolBar QWidget {
- font-size: 11px;
+ spacing: 0;
}
QToolBar::separator {
background: #666666;
width: 1px;
- margin: 2px;
}
QToolBar QToolButton {
- border: none;
- padding: 2px;
+ font-size: 11px;
+ border: 0;
+ height: 26px;
+ qproperty-iconSize: 20px;
+}
+
+QToolBar QLabel {
+ font-size: 10px;
+ qproperty-alignment: 'AlignBottom | AlignHCenter';
}
QToolBar QToolButton:checked {
@@ -365,6 +345,7 @@
SideBar {
padding: 0 2px;
border: none;
+ border-top: 1px solid #5a5a5a;
}
ToggleWidgetLabel {
@@ -460,22 +441,66 @@
background-color: #5b5b5b;
}
-FieldComboBox[invalid="true"] {
+FieldComboBox[invalid="true"]:hover, FieldComboBox[invalid="true"]:focus {
background: #fb9a99;
}
-FieldComboBox[invalid="true"]:hover {
- background: #fbb8b6;
-}
-
-FieldComboBox[invalid="true"]:focus {
- background: #fbb8b6;
-}
-
HorizontalLine {
border-top: 1px solid #dddddd;
border-left: 0;
border-bottom: 0;
border-right: 0;
}
-"""
+
+Ribbon {
+}
+
+Ribbon::tab-bar {
+ left: 5px;
+}
+
+Ribbon QTabBar {
+ font-size: 16pt;
+ background: #4f4f4f;
+}
+
+Ribbon QTabBar::tab {
+ min-width: 8ex;
+ padding: 4px 10px;
+ border: 1px solid #4f4f4f;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+ border-bottom-color: #dddddd;
+
+ margin-top: 5px;
+
+ /*To prevent gaps in horizontal line*/
+ margin-left: -1px;
+ margin-right: -1px;
+}
+
+Ribbon QTabBar::tab:selected,
+Ribbon QTabBar::tab:hover {
+ color: white;
+}
+
+Ribbon QTabBar::tab:selected {
+ background: #2e2e2e;
+ margin-left: -4px;
+ margin-right: -4px;
+ border-color: #dddddd;
+ border-bottom-color: #2e2e2e;
+}
+
+Ribbon QTabBar::tab:!selected {
+ /*Non-selected tabs look smaller*/
+ margin-top: 2px;
+}
+
+Ribbon QTabBar::tab:first:selected {
+ margin-left: 0;
+}
+
+Ribbon QTabBar::tab:last:selected {
+ margin-right: 0;
+}
View
@@ -3,6 +3,7 @@
<qresource prefix="/">
<file>icons/barcode.png</file>
<file>icons/close.png</file>
+ <file>icons/configure.png</file>
<file>icons/cookie_cutter.png</file>
<file>icons/down_arrow.png</file>
<file>icons/export_csv.png</file>
@@ -21,6 +22,8 @@
<file>icons/save.png</file>
<file>icons/save_crops.png</file>
<file>icons/segment.png</file>
+ <file>icons/show_expanded.png</file>
+ <file>icons/show_grid.png</file>
<file>icons/sort_cols.png</file>
<file>icons/sort_rows.png</file>
<file>icons/subsegment.png</file>
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -9,7 +9,7 @@ block_cipher = None
a = Analysis(['inselect.py'],
pathex=[str(Path('.').absolute())],
binaries=None,
- datas=None,
+ datas=[('data/inselect.qss', 'data/')],
hiddenimports=['sklearn.neighbors.typedefs'],
hookspath=[],
runtime_hooks=[],
Oops, something went wrong.

0 comments on commit 9a04917

Please sign in to comment.