projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed already unused topicEditButton from topicwidget
[quassel.git]
/
src
/
qtui
/
ui
/
mainwin.ui
diff --git
a/src/qtui/ui/mainwin.ui
b/src/qtui/ui/mainwin.ui
index
88a59ee
..
6f61c66
100644
(file)
--- a/
src/qtui/ui/mainwin.ui
+++ b/
src/qtui/ui/mainwin.ui
@@
-13,6
+13,14
@@
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget" >
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>22</y>
+ <width>800</width>
+ <height>556</height>
+ </rect>
+ </property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
@@
-20,19
+28,7
@@
</sizepolicy>
</property>
<layout class="QVBoxLayout" >
</sizepolicy>
</property>
<layout class="QVBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
+ <property name="margin" >
<number>0</number>
</property>
<item>
<number>0</number>
</property>
<item>
@@
-46,21
+42,23
@@
<x>0</x>
<y>0</y>
<width>800</width>
<x>0</x>
<y>0</y>
<width>800</width>
- <height>2
5
</height>
+ <height>2
2
</height>
</rect>
</property>
</rect>
</property>
- <widget class="QMenu" name="menu
Connection
" >
+ <widget class="QMenu" name="menu
File
" >
<property name="title" >
<property name="title" >
- <string>
Connection
</string>
+ <string>
&File
</string>
</property>
</property>
+ <widget class="QMenu" name="menuNetworks" >
+ <property name="title" >
+ <string>&Networks</string>
+ </property>
+ <addaction name="separator" />
+ </widget>
<addaction name="actionConnectCore" />
<addaction name="actionDisconnectCore" />
<addaction name="separator" />
<addaction name="actionConnectCore" />
<addaction name="actionDisconnectCore" />
<addaction name="separator" />
- <addaction name="actionNetworkList" />
- <addaction name="actionQuickConnect" />
- <addaction name="separator" />
- <addaction name="actionDisconnect" />
- <addaction name="actionReconnect" />
+ <addaction name="menuNetworks" />
<addaction name="separator" />
<addaction name="actionJoinChannel" />
<addaction name="separator" />
<addaction name="separator" />
<addaction name="actionJoinChannel" />
<addaction name="separator" />
@@
-70,48
+68,46
@@
</widget>
<widget class="QMenu" name="menuSettings" >
<property name="title" >
</widget>
<widget class="QMenu" name="menuSettings" >
<property name="title" >
- <string>Settings</string>
+ <string>
&
Settings</string>
</property>
</property>
- <addaction name="separator" />
- <addaction name="actionEditIdentities" />
- <addaction name="separator" />
- <addaction name="separator" />
<addaction name="actionSettingsDlg" />
</widget>
<widget class="QMenu" name="menuViews" >
<property name="title" >
<addaction name="actionSettingsDlg" />
</widget>
<widget class="QMenu" name="menuViews" >
<property name="title" >
- <string>Views</string>
+ <string>
&
Views</string>
</property>
<addaction name="actionManageViews" />
<addaction name="separator" />
</widget>
<widget class="QMenu" name="menuHelp" >
<property name="title" >
</property>
<addaction name="actionManageViews" />
<addaction name="separator" />
</widget>
<widget class="QMenu" name="menuHelp" >
<property name="title" >
- <string>Help</string>
+ <string>
&
Help</string>
</property>
<addaction name="actionAboutQuassel" />
<addaction name="actionAboutQt" />
</widget>
<widget class="QMenu" name="menuDebug" >
<property name="title" >
</property>
<addaction name="actionAboutQuassel" />
<addaction name="actionAboutQt" />
</widget>
<widget class="QMenu" name="menuDebug" >
<property name="title" >
- <string>Debug</string>
+ <string>
&
Debug</string>
</property>
<addaction name="actionDebug_Console" />
</property>
<addaction name="actionDebug_Console" />
- <addaction name="actionDisconnectNet" />
</widget>
</widget>
- <widget class="QMenu" name="menuCore" >
- <property name="title" >
- <string>Core</string>
- </property>
- </widget>
- <addaction name="menuConnection" />
+ <addaction name="menuFile" />
<addaction name="menuViews" />
<addaction name="menuViews" />
- <addaction name="menuCore" />
<addaction name="menuSettings" />
<addaction name="menuDebug" />
<addaction name="menuHelp" />
</widget>
<addaction name="menuSettings" />
<addaction name="menuDebug" />
<addaction name="menuHelp" />
</widget>
- <widget class="QStatusBar" name="statusbar" />
+ <widget class="QStatusBar" name="statusbar" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>578</y>
+ <width>800</width>
+ <height>22</height>
+ </rect>
+ </property>
+ </widget>
<action name="actionNetworkList" >
<property name="enabled" >
<bool>false</bool>
<action name="actionNetworkList" >
<property name="enabled" >
<bool>false</bool>
@@
-165,7
+161,8
@@
</action>
<action name="actionQuit" >
<property name="icon" >
</action>
<action name="actionQuit" >
<property name="icon" >
- <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/application-exit.png</iconset>
+ <iconset resource="../../icons/icons.qrc" >
+ <normaloff>:/22x22/actions/oxygen/22x22/actions/application-exit.png</normaloff>:/22x22/actions/oxygen/22x22/actions/application-exit.png</iconset>
</property>
<property name="text" >
<string>Quit...</string>
</property>
<property name="text" >
<string>Quit...</string>
@@
-181,7
+178,9
@@
</action>
<action name="actionSettingsDlg" >
<property name="icon" >
</action>
<action name="actionSettingsDlg" >
<property name="icon" >
- <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/configure.png</iconset>
+ <iconset>
+ <normaloff/>
+ </iconset>
</property>
<property name="text" >
<string>Configure Quassel...</string>
</property>
<property name="text" >
<string>Configure Quassel...</string>
@@
-192,7
+191,7
@@
</action>
<action name="actionManageViews" >
<property name="enabled" >
</action>
<action name="actionManageViews" >
<property name="enabled" >
- <bool>
fals
e</bool>
+ <bool>
tru
e</bool>
</property>
<property name="text" >
<string>Manage Views...</string>
</property>
<property name="text" >
<string>Manage Views...</string>
@@
-205,10
+204,11
@@
</action>
<action name="actionAboutQuassel" >
<property name="enabled" >
</action>
<action name="actionAboutQuassel" >
<property name="enabled" >
- <bool>
fals
e</bool>
+ <bool>
tru
e</bool>
</property>
<property name="icon" >
</property>
<property name="icon" >
- <iconset resource="../../icons/icons.qrc" >:/icons/quassel-icon.png</iconset>
+ <iconset resource="../../icons/quassel-icons.qrc" >
+ <normaloff>:/icons/quassel-icon.png</normaloff>:/icons/quassel-icon.png</iconset>
</property>
<property name="text" >
<string>About Quassel IRC...</string>
</property>
<property name="text" >
<string>About Quassel IRC...</string>
@@
-239,7
+239,9
@@
<bool>false</bool>
</property>
<property name="icon" >
<bool>false</bool>
</property>
<property name="icon" >
- <iconset/>
+ <iconset>
+ <normaloff/>
+ </iconset>
</property>
<property name="text" >
<string>Disconnect from Core</string>
</property>
<property name="text" >
<string>Disconnect from Core</string>
@@
-250,7
+252,9
@@
<bool>false</bool>
</property>
<property name="icon" >
<bool>false</bool>
</property>
<property name="icon" >
- <iconset/>
+ <iconset>
+ <normaloff/>
+ </iconset>
</property>
<property name="text" >
<string>Connect to Core...</string>
</property>
<property name="text" >
<string>Connect to Core...</string>
@@
-266,6
+270,14
@@
<string>Disconnect from Network...</string>
</property>
</action>
<string>Disconnect from Network...</string>
</property>
</action>
+ <action name="actionEditNetworks" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>&Edit Networks...</string>
+ </property>
+ </action>
</widget>
<customwidgets>
<customwidget>
</widget>
<customwidgets>
<customwidget>
@@
-276,23
+288,7
@@
</customwidgets>
<resources>
<include location="../../icons/icons.qrc" />
</customwidgets>
<resources>
<include location="../../icons/icons.qrc" />
+ <include location="../../icons/quassel-icons.qrc" />
</resources>
</resources>
- <connections>
- <connection>
- <sender>actionQuit</sender>
- <signal>triggered()</signal>
- <receiver>MainWin</receiver>
- <slot>close()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>-1</x>
- <y>-1</y>
- </hint>
- <hint type="destinationlabel" >
- <x>399</x>
- <y>299</y>
- </hint>
- </hints>
- </connection>
- </connections>
+ <connections/>
</ui>
</ui>