Changed QComboBox to QEditText for kiosk mode - fixed key-shortcuts + close tab; refs #102

This commit is contained in:
Marc Wäckerlin
2011-09-21 12:00:34 +00:00
parent f1fd1f7da1
commit 57fa0ea109
6 changed files with 363 additions and 313 deletions

View File

@@ -82,6 +82,7 @@
<addaction name="actionPrint"/>
<addaction name="actionInstantPrint"/>
<addaction name="separator"/>
<addaction name="actionCloseTab"/>
<addaction name="actionClose"/>
</widget>
<widget class="QMenu" name="menuEdit">
@@ -217,10 +218,7 @@
<normaloff>:/icons/close</normaloff>:/icons/close</iconset>
</property>
<property name="text">
<string>&amp;Close</string>
</property>
<property name="shortcut">
<string>Ctrl+W</string>
<string>&amp;Quit</string>
</property>
</action>
<action name="actionProxySettings">
@@ -434,6 +432,18 @@
<string>clear find bar</string>
</property>
</action>
<action name="actionCloseTab">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/close</normaloff>:/icons/close</iconset>
</property>
<property name="text">
<string>&amp;Close Tab</string>
</property>
<property name="shortcut">
<string>Ctrl+W</string>
</property>
</action>
</widget>
<resources>
<include location="resources.qrc"/>