diff options
| -rw-r--r-- | src/frontend/gui/sisyphus-gui.py | 22 | ||||
| -rw-r--r-- | src/frontend/gui/ui/sisyphus.ui | 166 |
2 files changed, 149 insertions, 39 deletions
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index 4e9a8b1..fa2b057 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -21,25 +21,25 @@ class Sisyphus(QtWidgets.QMainWindow): self.show() self.filterApplications = OrderedDict([ - ('Search by Name', 'pn'), - ('Search by Category', 'cat'), - ('Search by Description', 'descr') + ('name', 'pn'), + ('category', 'cat'), + ('description', 'descr') ]) self.applicationFilter.addItems(self.filterApplications.keys()) - self.applicationFilter.setCurrentText('Search by Name') + self.applicationFilter.setCurrentText('name') self.applicationFilter.currentIndexChanged.connect(self.setApplicationFilter) - Sisyphus.applicationView = self.filterApplications['Search by Name'] + Sisyphus.applicationView = self.filterApplications['name'] self.filterDatabases = OrderedDict([ - ('All Packages', 'all'), - ('Installed Packages', 'installed'), - ('Available Packages', 'installable'), - ('Upgradable Packages', 'upgradable') + ('all packages', 'all'), + ('installed packages', 'installed'), + ('available packages', 'installable'), + ('upgradable packages', 'upgradable') ]) self.databaseFilter.addItems(self.filterDatabases.keys()) - self.databaseFilter.setCurrentText('All Packages') + self.databaseFilter.setCurrentText('all packages') self.databaseFilter.currentIndexChanged.connect(self.setDatabaseFilter) - Sisyphus.databaseView = self.filterDatabases['All Packages'] + Sisyphus.databaseView = self.filterDatabases['all packages'] Sisyphus.searchTerm = "'%%'" diff --git a/src/frontend/gui/ui/sisyphus.ui b/src/frontend/gui/ui/sisyphus.ui index 2831d55..a870d6b 100644 --- a/src/frontend/gui/ui/sisyphus.ui +++ b/src/frontend/gui/ui/sisyphus.ui @@ -55,7 +55,7 @@ <enum>QFrame::StyledPanel</enum> </property> <property name="frameShadow"> - <enum>QFrame::Raised</enum> + <enum>QFrame::Sunken</enum> </property> <property name="verticalScrollBarPolicy"> <enum>Qt::ScrollBarAlwaysOn</enum> @@ -113,33 +113,99 @@ <number>25</number> </property> <item> - <widget class="QPushButton" name="settingsButton"> + <widget class="QLabel" name="label1"> <property name="maximumSize"> <size> - <width>25</width> - <height>25</height> + <width>16777215</width> + <height>30</height> </size> </property> - <property name="toolTip"> - <string><html><head/><body><p align="center">Mirror Configuration</p></body></html></string> + <property name="font"> + <font> + <pointsize>10</pointsize> + </font> </property> - <property name="icon"> - <iconset> - <normaloff>../icon/settings.png</normaloff>../icon/settings.png</iconset> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> </property> - <property name="iconSize"> + <property name="text"> + <string>Search by</string> + </property> + <property name="textFormat"> + <enum>Qt::MarkdownText</enum> + </property> + <property name="scaledContents"> + <bool>true</bool> + </property> + <property name="textInteractionFlags"> + <set>Qt::NoTextInteraction</set> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="applicationFilter"> + <property name="maximumSize"> <size> - <width>16</width> - <height>16</height> + <width>16777215</width> + <height>30</height> + </size> + </property> + <property name="frame"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label2"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>30</height> </size> </property> + <property name="font"> + <font> + <pointsize>10</pointsize> + </font> + </property> + <property name="mouseTracking"> + <bool>true</bool> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="text"> + <string>in</string> + </property> + <property name="scaledContents"> + <bool>true</bool> + </property> + <property name="textInteractionFlags"> + <set>Qt::NoTextInteraction</set> + </property> </widget> </item> <item> - <widget class="QComboBox" name="applicationFilter"/> + <widget class="QComboBox" name="databaseFilter"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>30</height> + </size> + </property> + <property name="frame"> + <bool>false</bool> + </property> + </widget> </item> <item> <widget class="QLineEdit" name="inputBox"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>30</height> + </size> + </property> <property name="toolTip"> <string><html><head/><body><p align="center">Write package name and press Enter</p></body></html></string> </property> @@ -149,14 +215,11 @@ </widget> </item> <item> - <widget class="QComboBox" name="databaseFilter"/> - </item> - <item> <widget class="QPushButton" name="licenseButton"> <property name="maximumSize"> <size> - <width>25</width> - <height>25</height> + <width>16777215</width> + <height>30</height> </size> </property> <property name="toolTip"> @@ -172,6 +235,35 @@ <height>16</height> </size> </property> + <property name="flat"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="settingsButton"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>30</height> + </size> + </property> + <property name="toolTip"> + <string><html><head/><body><p align="center">Mirror Configuration</p></body></html></string> + </property> + <property name="icon"> + <iconset> + <normaloff>../icon/settings.png</normaloff>../icon/settings.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>16</width> + <height>16</height> + </size> + </property> + <property name="flat"> + <bool>true</bool> + </property> </widget> </item> </layout> @@ -192,7 +284,7 @@ <property name="maximumSize"> <size> <width>16777215</width> - <height>25</height> + <height>30</height> </size> </property> <property name="toolTip"> @@ -211,6 +303,9 @@ <height>16</height> </size> </property> + <property name="flat"> + <bool>true</bool> + </property> </widget> </item> <item> @@ -218,7 +313,7 @@ <property name="maximumSize"> <size> <width>16777215</width> - <height>25</height> + <height>30</height> </size> </property> <property name="toolTip"> @@ -237,6 +332,9 @@ <height>16</height> </size> </property> + <property name="flat"> + <bool>true</bool> + </property> </widget> </item> <item> @@ -244,7 +342,7 @@ <property name="maximumSize"> <size> <width>16777215</width> - <height>25</height> + <height>30</height> </size> </property> <property name="toolTip"> @@ -260,6 +358,9 @@ <height>16</height> </size> </property> + <property name="flat"> + <bool>true</bool> + </property> </widget> </item> <item> @@ -267,7 +368,7 @@ <property name="maximumSize"> <size> <width>16777215</width> - <height>25</height> + <height>30</height> </size> </property> <property name="toolTip"> @@ -286,6 +387,9 @@ <height>16</height> </size> </property> + <property name="flat"> + <bool>true</bool> + </property> </widget> </item> <item> @@ -293,7 +397,7 @@ <property name="maximumSize"> <size> <width>16777215</width> - <height>25</height> + <height>30</height> </size> </property> <property name="toolTip"> @@ -309,6 +413,9 @@ <height>16</height> </size> </property> + <property name="flat"> + <bool>true</bool> + </property> </widget> </item> </layout> @@ -331,14 +438,17 @@ <property name="minimumSize"> <size> <width>0</width> - <height>250</height> + <height>200</height> </size> </property> <property name="toolTip"> <string><html><head/><body><p align="center">Progress Box</p></body></html></string> </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> <property name="frameShadow"> - <enum>QFrame::Raised</enum> + <enum>QFrame::Sunken</enum> </property> <property name="verticalScrollBarPolicy"> <enum>Qt::ScrollBarAlwaysOn</enum> @@ -355,12 +465,12 @@ </widget> </widget> <tabstops> - <tabstop>settingsButton</tabstop> <tabstop>applicationFilter</tabstop> - <tabstop>inputBox</tabstop> <tabstop>databaseFilter</tabstop> - <tabstop>databaseTable</tabstop> + <tabstop>inputBox</tabstop> <tabstop>licenseButton</tabstop> + <tabstop>settingsButton</tabstop> + <tabstop>databaseTable</tabstop> <tabstop>progressBox</tabstop> <tabstop>installButton</tabstop> <tabstop>uninstallButton</tabstop> |