projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fixes to the coreconnectdlg...
[quassel.git]
/
src
/
qtui
/
ui
/
mainwin.ui
diff --git
a/src/qtui/ui/mainwin.ui
b/src/qtui/ui/mainwin.ui
index
f926cf9
..
8c55c8a
100644
(file)
--- a/
src/qtui/ui/mainwin.ui
+++ b/
src/qtui/ui/mainwin.ui
@@
-46,21
+46,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
7
</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,41
+72,36
@@
</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 class="QMenu" name="menuCore" >
<property name="title" >
</widget>
<widget class="QMenu" name="menuCore" >
<property name="title" >
- <string>Core</string>
+ <string>
&
Core</string>
</property>
</widget>
</property>
</widget>
- <addaction name="menu
Connection
" />
+ <addaction name="menu
File
" />
<addaction name="menuViews" />
<addaction name="menuCore" />
<addaction name="menuSettings" />
<addaction name="menuViews" />
<addaction name="menuCore" />
<addaction name="menuSettings" />
@@
-113,6
+110,9
@@
</widget>
<widget class="QStatusBar" name="statusbar" />
<action name="actionNetworkList" >
</widget>
<widget class="QStatusBar" name="statusbar" />
<action name="actionNetworkList" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
<property name="text" >
<string>&Network List...</string>
</property>
<property name="text" >
<string>&Network List...</string>
</property>
@@
-178,7
+178,7
@@
</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
/
>
</property>
<property name="text" >
<string>Configure Quassel...</string>
</property>
<property name="text" >
<string>Configure Quassel...</string>
@@
-201,6
+201,9
@@
</property>
</action>
<action name="actionAboutQuassel" >
</property>
</action>
<action name="actionAboutQuassel" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
<property name="icon" >
<iconset resource="../../icons/icons.qrc" >:/icons/quassel-icon.png</iconset>
</property>
<property name="icon" >
<iconset resource="../../icons/icons.qrc" >:/icons/quassel-icon.png</iconset>
</property>
@@
-260,6
+263,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>
@@
-271,22
+282,5
@@
<resources>
<include location="../../icons/icons.qrc" />
</resources>
<resources>
<include location="../../icons/icons.qrc" />
</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>