- added settings: gtk: console font

- show emerge progress in window title

1 files changed, 274 insertions, 228 deletions

diff --git a/portato/gui/templates/ui/PreferenceWindow.ui b/portato/gui/templates/ui/PreferenceWindow.ui
index fbc4a37..a7cf96f 100644
--- a/portato/gui/templates/ui/PreferenceWindow.ui
+++ b/portato/gui/templates/ui/PreferenceWindow.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>570</width>
-    <height>729</height>
+    <width>563</width>
+    <height>699</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -20,229 +20,217 @@
     <number>6</number>
    </property>
    <item>
-    <widget class="QGroupBox" name="generalBox" >
-     <property name="title" >
-      <string>General Options</string>
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="currentIndex" >
+      <number>1</number>
      </property>
-     <property name="alignment" >
-      <set>Qt::AlignLeading</set>
-     </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="debugCheck" >
-        <property name="text" >
-         <string>Debug</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="guiBox" >
-     <property name="title" >
-      <string>Visual Options</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="pkgIconsCheck" >
-        <property name="text" >
-         <string>Use icons in package list</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="systrayCheck" >
-        <property name="text" >
-         <string>Show systray icon</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="minimizeCheck" >
-        <property name="text" >
-         <string>Minimize to systray (only if systray icon is activated)</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="syncBox" >
-     <property name="title" >
-      <string>Sync Options</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="label" >
-        <property name="text" >
-         <string>Sync command:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="syncCmdEdit" />
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="updateBox" >
-     <property name="title" >
-      <string>Update World Options</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="deepCheck" >
-        <property name="text" >
-         <string>--deep</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="newUseCheck" >
-        <property name="text" >
-         <string>--newuse</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="flagBox" >
-     <property name="title" >
-      <string>Use Flag and Keyword Options</string>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="7" column="0" >
-       <widget class="QLabel" name="label_7" >
-        <property name="text" >
-         <string>&lt;u>&lt;i>Masking Keywords&lt;/u>&lt;/i></string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="label_3" >
-        <property name="text" >
-         <string>&lt;i>&lt;u>Use Flags&lt;/u>&lt;/i></string>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="1" >
-       <widget class="QLineEdit" name="maskEdit" >
-        <property name="text" >
-         <string>portato</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0" >
-       <widget class="QCheckBox" name="testingCheck" >
-        <property name="text" >
-         <string>Add only exact version to package.keywords</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0" >
-       <widget class="QLabel" name="label_6" >
-        <property name="text" >
-         <string>File name to use, if package.keywords is a directory</string>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="0" >
-       <widget class="QLabel" name="label_8" >
-        <property name="text" >
-         <string>File name to use if package.mask/.unmask is a directory</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QCheckBox" name="useCheck" >
-        <property name="text" >
-         <string>Add only exact version to package.use</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" >
-       <widget class="QLineEdit" name="useEdit" >
-        <property name="text" >
-         <string>portato</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="label_5" >
-        <property name="text" >
-         <string>&lt;i>&lt;u>Testing Keywords&lt;/u>&lt;/i></string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="label_4" >
-        <property name="text" >
-         <string>File name to use, if package.use is a directory</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0" >
-       <widget class="QCheckBox" name="maskCheck" >
-        <property name="text" >
-         <string>Add only exact version to package.mask/.unmask</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1" >
-       <widget class="QLineEdit" name="testingEdit" >
-        <property name="text" >
-         <string>portato</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="2" >
-       <widget class="QLabel" name="hintLabel" >
-        <property name="autoFillBackground" >
-         <bool>true</bool>
-        </property>
-        <property name="frameShape" >
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow" >
-         <enum>QFrame::Raised</enum>
-        </property>
-        <property name="text" >
-         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+     <widget class="QWidget" name="generalTab" >
+      <attribute name="title" >
+       <string>General</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QCheckBox" name="debugCheck" >
+         <property name="text" >
+          <string>Debug</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="portageTab" >
+      <attribute name="title" >
+       <string>Portage</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="syncBox" >
+         <property name="title" >
+          <string>Sync Options</string>
+         </property>
+         <layout class="QHBoxLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>Sync command:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="syncCmdEdit" />
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="updateBox" >
+         <property name="title" >
+          <string>Update World Options</string>
+         </property>
+         <layout class="QVBoxLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QCheckBox" name="deepCheck" >
+            <property name="text" >
+             <string>--deep</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="newUseCheck" >
+            <property name="text" >
+             <string>--newuse</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="flagBox" >
+         <property name="title" >
+          <string>Use Flag and Keyword Options</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="7" column="0" >
+           <widget class="QLabel" name="label_7" >
+            <property name="text" >
+             <string>&lt;u>&lt;i>Masking Keywords&lt;/u>&lt;/i></string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_3" >
+            <property name="text" >
+             <string>&lt;i>&lt;u>Use Flags&lt;/u>&lt;/i></string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="1" >
+           <widget class="QLineEdit" name="maskEdit" >
+            <property name="text" >
+             <string>portato</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0" >
+           <widget class="QCheckBox" name="testingCheck" >
+            <property name="text" >
+             <string>Add only exact version to package.keywords</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0" >
+           <widget class="QLabel" name="label_6" >
+            <property name="text" >
+             <string>File name to use, if package.keywords is a directory</string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="0" >
+           <widget class="QLabel" name="label_8" >
+            <property name="text" >
+             <string>File name to use if package.mask/.unmask is a directory</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" >
+           <widget class="QCheckBox" name="useCheck" >
+            <property name="text" >
+             <string>Add only exact version to package.use</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1" >
+           <widget class="QLineEdit" name="useEdit" >
+            <property name="text" >
+             <string>portato</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0" >
+           <widget class="QLabel" name="label_5" >
+            <property name="text" >
+             <string>&lt;i>&lt;u>Testing Keywords&lt;/u>&lt;/i></string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" >
+           <widget class="QLabel" name="label_4" >
+            <property name="text" >
+             <string>File name to use, if package.use is a directory</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="0" >
+           <widget class="QCheckBox" name="maskCheck" >
+            <property name="text" >
+             <string>Add only exact version to package.mask/.unmask</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1" >
+           <widget class="QLineEdit" name="testingEdit" >
+            <property name="text" >
+             <string>portato</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" colspan="2" >
+           <widget class="QLabel" name="hintLabel" >
+            <property name="autoFillBackground" >
+             <bool>true</bool>
+            </property>
+            <property name="frameShape" >
+             <enum>QFrame::StyledPanel</enum>
+            </property>
+            <property name="frameShadow" >
+             <enum>QFrame::Raised</enum>
+            </property>
+            <property name="text" >
+             <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
 &lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;">
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" text-decoration: underline;">You may use the following placeholders:&lt;/span> &lt;/p>
@@ -250,10 +238,68 @@ p, li { white-space: pre-wrap; }
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-style:italic;">$(cat)&lt;/span>: category&lt;/p>
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-style:italic;">$(pkg)&lt;/span>: package name&lt;/p>
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-style:italic;">$(cat-1)/$(cat-2)&lt;/span>: first/second part of the category&lt;/p>&lt;/body>&lt;/html></string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="visualTab" >
+      <attribute name="title" >
+       <string>Visual</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QCheckBox" name="pkgIconsCheck" >
+         <property name="text" >
+          <string>Use icons in package list</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="titleUpdateCheck" >
+         <property name="text" >
+          <string>Show emerge progress in title - similar to the console tab</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="systrayCheck" >
+         <property name="text" >
+          <string>Show systray icon</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="minimizeCheck" >
+         <property name="text" >
+          <string>Minimize to systray (only if systray icon is activated)</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item>