projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing/tweaking various UIs, mostly icons
[quassel.git]
/
src
/
qtui
/
ui
/
mainwin.ui
diff --git
a/src/qtui/ui/mainwin.ui
b/src/qtui/ui/mainwin.ui
index
6f61c66
..
5a6cf54
100644
(file)
--- a/
src/qtui/ui/mainwin.ui
+++ b/
src/qtui/ui/mainwin.ui
@@
-16,9
+16,9
@@
<property name="geometry" >
<rect>
<x>0</x>
<property name="geometry" >
<rect>
<x>0</x>
- <y>2
2
</y>
+ <y>2
4
</y>
<width>800</width>
<width>800</width>
- <height>55
6
</height>
+ <height>55
5
</height>
</rect>
</property>
<property name="sizePolicy" >
</rect>
</property>
<property name="sizePolicy" >
@@
-42,7
+42,7
@@
<x>0</x>
<y>0</y>
<width>800</width>
<x>0</x>
<y>0</y>
<width>800</width>
- <height>2
2
</height>
+ <height>2
4
</height>
</rect>
</property>
<widget class="QMenu" name="menuFile" >
</rect>
</property>
<widget class="QMenu" name="menuFile" >
@@
-59,9
+59,7
@@
<addaction name="actionDisconnectCore" />
<addaction name="separator" />
<addaction name="menuNetworks" />
<addaction name="actionDisconnectCore" />
<addaction name="separator" />
<addaction name="menuNetworks" />
- <addaction name="separator" />
<addaction name="actionJoinChannel" />
<addaction name="actionJoinChannel" />
- <addaction name="separator" />
<addaction name="actionSetAwayGlobally" />
<addaction name="separator" />
<addaction name="actionQuit" />
<addaction name="actionSetAwayGlobally" />
<addaction name="separator" />
<addaction name="actionQuit" />
@@
-102,9
+100,9
@@
<property name="geometry" >
<rect>
<x>0</x>
<property name="geometry" >
<rect>
<x>0</x>
- <y>57
8
</y>
+ <y>57
9
</y>
<width>800</width>
<width>800</width>
- <height>2
2
</height>
+ <height>2
1
</height>
</rect>
</property>
</widget>
</rect>
</property>
</widget>
@@
-150,6
+148,9
@@
<property name="text" >
<string>Join Channel...</string>
</property>
<property name="text" >
<string>Join Channel...</string>
</property>
+ <property name="visible" >
+ <bool>false</bool>
+ </property>
</action>
<action name="actionSetAwayGlobally" >
<property name="enabled" >
</action>
<action name="actionSetAwayGlobally" >
<property name="enabled" >
@@
-158,6
+159,9
@@
<property name="text" >
<string>Set Away globally</string>
</property>
<property name="text" >
<string>Set Away globally</string>
</property>
+ <property name="visible" >
+ <bool>false</bool>
+ </property>
</action>
<action name="actionQuit" >
<property name="icon" >
</action>
<action name="actionQuit" >
<property name="icon" >
@@
-178,9
+182,8
@@
</action>
<action name="actionSettingsDlg" >
<property name="icon" >
</action>
<action name="actionSettingsDlg" >
<property name="icon" >
- <iconset>
- <normaloff/>
- </iconset>
+ <iconset resource="../../icons/icons.qrc" >
+ <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
</property>
<property name="text" >
<string>Configure Quassel...</string>
</property>
<property name="text" >
<string>Configure Quassel...</string>
@@
-193,6
+196,10
@@
<property name="enabled" >
<bool>true</bool>
</property>
<property name="enabled" >
<bool>true</bool>
</property>
+ <property name="icon" >
+ <iconset resource="../../icons/icons.qrc" >
+ <normaloff>:/16x16/actions/oxygen/16x16/actions/view-tree.png</normaloff>:/16x16/actions/oxygen/16x16/actions/view-tree.png</iconset>
+ </property>
<property name="text" >
<string>Manage Views...</string>
</property>
<property name="text" >
<string>Manage Views...</string>
</property>
@@
-239,9
+246,8
@@
<bool>false</bool>
</property>
<property name="icon" >
<bool>false</bool>
</property>
<property name="icon" >
- <iconset>
- <normaloff/>
- </iconset>
+ <iconset resource="../../icons/icons.qrc" >
+ <normaloff>:/16x16/actions/network-disconnect</normaloff>:/16x16/actions/network-disconnect</iconset>
</property>
<property name="text" >
<string>Disconnect from Core</string>
</property>
<property name="text" >
<string>Disconnect from Core</string>
@@
-252,9
+258,8
@@
<bool>false</bool>
</property>
<property name="icon" >
<bool>false</bool>
</property>
<property name="icon" >
- <iconset>
- <normaloff/>
- </iconset>
+ <iconset resource="../../icons/icons.qrc" >
+ <normaloff>:/16x16/actions/network-connect</normaloff>:/16x16/actions/network-connect</iconset>
</property>
<property name="text" >
<string>Connect to Core...</string>
</property>
<property name="text" >
<string>Connect to Core...</string>