marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change tool hotkeys from <number> to to <Ctrl>+<number> 

This allows better combined playing+editing experience [Maikel]
directional-lights
Sven Eberhardt 2016-10-08 19:14:43 -04:00
parent 685513816f
commit 45718ee44d
1 changed files with 308 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

641
src/editor/C4ConsoleQtMainWindow.ui
View File

@ -18,339 +18,311 @@
<normaloff>:/editor/res/oc64.png</normaloff>:/editor/res/oc64.png</iconset> <normaloff>:/editor/res/oc64.png</normaloff>:/editor/res/oc64.png</iconset>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<widget class="QComboBox" name="foregroundMatTexComboBox"> <layout class="QGridLayout" name="gridLayout">
<property name="geometry"> <item row="0" column="0">
<rect> <widget class="QComboBox" name="foregroundMatTexComboBox">
<x>10</x> <property name="editable">
<y>10</y> <bool>false</bool>
<width>74</width>
<height>20</height>
</rect>
</property>
<property name="editable">
<bool>false</bool>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
<widget class="QComboBox" name="backgroundMatTexComboBox">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>74</width>
<height>20</height>
</rect>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
<widget class="QSlider" name="drawSizeSlider">
<property name="geometry">
<rect>
<x>200</x>
<y>10</y>
<width>100</width>
<height>16</height>
</rect>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="value">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
<widget class="QLabel" name="drawSizeLabel">
<property name="geometry">
<rect>
<x>150</x>
<y>10</y>
<width>47</width>
<height>13</height>
</rect>
</property>
<property name="text">
<string comment="res">IDS_CTL_SIZE</string>
</property>
</widget>
<widget class="QDockWidget" name="welcomeDockWidget">
<property name="geometry">
<rect>
<x>30</x>
<y>60</y>
<width>311</width>
<height>211</height>
</rect>
</property>
<property name="windowTitle">
<string comment="res">IDS_CNS_WELCOME</string>
</property>
<widget class="QWidget" name="welcomeDockWidgetContents">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property> </property>
<property name="leftMargin"> <property name="sizeAdjustPolicy">
<number>0</number> <enum>QComboBox::AdjustToContents</enum>
</property> </property>
<property name="topMargin"> </widget>
<number>0</number> </item>
<item row="0" column="1">
<widget class="QLabel" name="drawSizeLabel">
<property name="text">
<string comment="res">IDS_CTL_SIZE</string>
</property> </property>
<property name="rightMargin"> </widget>
<number>0</number> </item>
<item row="0" column="2">
<widget class="QSlider" name="drawSizeSlider">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property> </property>
<property name="bottomMargin"> <property name="minimum">
<number>0</number> <number>1</number>
</property> </property>
<item> <property name="value">
<widget class="QScrollArea" name="welcomeScrollArea"> <number>10</number>
<property name="palette"> </property>
<palette> <property name="orientation">
<active> <enum>Qt::Horizontal</enum>
<colorrole role="Base"> </property>
<brush brushstyle="SolidPattern"> </widget>
<color alpha="255"> </item>
<red>255</red> <item row="1" column="0">
<green>255</green> <widget class="QComboBox" name="backgroundMatTexComboBox">
<blue>255</blue> <property name="sizeAdjustPolicy">
</color> <enum>QComboBox::AdjustToContents</enum>
</brush> </property>
</colorrole> </widget>
<colorrole role="Window"> </item>
<brush brushstyle="SolidPattern"> <item row="2" column="0" colspan="3">
<color alpha="255"> <widget class="QDockWidget" name="welcomeDockWidget">
<red>255</red> <property name="windowTitle">
<green>251</green> <string comment="res">IDS_CNS_WELCOME</string>
<blue>241</blue> </property>
</color> <widget class="QWidget" name="welcomeDockWidgetContents">
</brush> <layout class="QHBoxLayout" name="horizontalLayout">
</colorrole> <property name="spacing">
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>251</green>
<blue>241</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>251</green>
<blue>241</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>251</green>
<blue>241</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="lineWidth">
<number>0</number> <number>0</number>
</property> </property>
<property name="widgetResizable"> <property name="leftMargin">
<bool>true</bool> <number>0</number>
</property> </property>
<widget class="QWidget" name="welcomeScrollAreaWidgetContents"> <property name="topMargin">
<property name="geometry"> <number>0</number>
<rect> </property>
<x>0</x> <property name="rightMargin">
<y>0</y> <number>0</number>
<width>311</width> </property>
<height>191</height> <property name="bottomMargin">
</rect> <number>0</number>
</property> </property>
<layout class="QVBoxLayout" name="welcomeScrollLayout"> <item>
<item> <widget class="QScrollArea" name="welcomeScrollArea">
<spacer name="verticalSpacer_3"> <property name="palette">
<property name="orientation"> <palette>
<enum>Qt::Vertical</enum> <active>
</property> <colorrole role="Base">
<property name="sizeType"> <brush brushstyle="SolidPattern">
<enum>QSizePolicy::Maximum</enum> <color alpha="255">
</property> <red>255</red>
<property name="sizeHint" stdset="0"> <green>255</green>
<size> <blue>255</blue>
<width>20</width> </color>
<height>10</height> </brush>
</size> </colorrole>
</property> <colorrole role="Window">
</spacer> <brush brushstyle="SolidPattern">
</item> <color alpha="255">
<item> <red>255</red>
<widget class="QLabel" name="welcomeTitleLabel"> <green>251</green>
<property name="font"> <blue>241</blue>
<font> </color>
<pointsize>16</pointsize> </brush>
</font> </colorrole>
</property> </active>
<property name="text"> <inactive>
<string comment="res">IDS_CNS_EDITOR</string> <colorrole role="Base">
</property> <brush brushstyle="SolidPattern">
</widget> <color alpha="255">
</item> <red>255</red>
<item> <green>255</green>
<spacer name="verticalSpacer_2"> <blue>255</blue>
<property name="orientation"> </color>
<enum>Qt::Vertical</enum> </brush>
</property> </colorrole>
<property name="sizeType"> <colorrole role="Window">
<enum>QSizePolicy::Maximum</enum> <brush brushstyle="SolidPattern">
</property> <color alpha="255">
<property name="sizeHint" stdset="0"> <red>255</red>
<size> <green>251</green>
<width>20</width> <blue>241</blue>
<height>10</height> </color>
</size> </brush>
</property> </colorrole>
</spacer> </inactive>
</item> <disabled>
<item> <colorrole role="Base">
<widget class="QLabel" name="welcomeStartLabel"> <brush brushstyle="SolidPattern">
<property name="font"> <color alpha="255">
<font> <red>255</red>
<pointsize>9</pointsize> <green>251</green>
</font> <blue>241</blue>
</property> </color>
<property name="text"> </brush>
<string comment="res">IDS_MNU_START</string> </colorrole>
</property> <colorrole role="Window">
<property name="indent"> <brush brushstyle="SolidPattern">
<number>15</number> <color alpha="255">
</property> <red>255</red>
</widget> <green>251</green>
</item> <blue>241</blue>
<item> </color>
<widget class="QLabel" name="welcomeNewLabel"> </brush>
<property name="text"> </colorrole>
<string comment="res">IDS_MNU_NEW</string> </disabled>
</property> </palette>
<property name="indent"> </property>
<number>25</number> <property name="autoFillBackground">
</property> <bool>true</bool>
<property name="textInteractionFlags"> </property>
<set>Qt::TextBrowserInteraction</set> <property name="frameShape">
</property> <enum>QFrame::NoFrame</enum>
</widget> </property>
</item> <property name="lineWidth">
<item> <number>0</number>
<widget class="QLabel" name="welcomeOpenLabel"> </property>
<property name="text"> <property name="widgetResizable">
<string comment="res">IDS_MNU_OPEN</string> <bool>true</bool>
</property> </property>
<property name="indent"> <widget class="QWidget" name="welcomeScrollAreaWidgetContents">
<number>25</number> <property name="geometry">
</property> <rect>
<property name="textInteractionFlags"> <x>0</x>
<set>Qt::TextBrowserInteraction</set> <y>0</y>
</property> <width>417</width>
</widget> <height>229</height>
</item> </rect>
<item> </property>
<widget class="QLabel" name="welcomeExploreUserPathLabel"> <layout class="QVBoxLayout" name="welcomeScrollLayout">
<property name="text"> <item>
<string comment="res">IDS_MNU_EXPLOREUSERPATH</string> <spacer name="verticalSpacer_3">
</property> <property name="orientation">
<property name="indent"> <enum>Qt::Vertical</enum>
<number>25</number> </property>
</property> <property name="sizeType">
<property name="textInteractionFlags"> <enum>QSizePolicy::Maximum</enum>
<set>Qt::TextBrowserInteraction</set> </property>
</property> <property name="sizeHint" stdset="0">
</widget> <size>
</item> <width>20</width>
<item> <height>10</height>
<spacer name="verticalSpacer_4"> </size>
<property name="orientation"> </property>
<enum>Qt::Vertical</enum> </spacer>
</property> </item>
<property name="sizeType"> <item>
<enum>QSizePolicy::Maximum</enum> <widget class="QLabel" name="welcomeTitleLabel">
</property> <property name="font">
<property name="sizeHint" stdset="0"> <font>
<size> <pointsize>16</pointsize>
<width>20</width> </font>
<height>10</height> </property>
</size> <property name="text">
</property> <string comment="res">IDS_CNS_EDITOR</string>
</spacer> </property>
</item> </widget>
<item> </item>
<widget class="QLabel" name="welcomeRecentLabel"> <item>
<property name="font"> <spacer name="verticalSpacer_2">
<font> <property name="orientation">
<pointsize>9</pointsize> <enum>Qt::Vertical</enum>
</font> </property>
</property> <property name="sizeType">
<property name="text"> <enum>QSizePolicy::Maximum</enum>
<string comment="res">IDS_MNU_RECENT</string> </property>
</property> <property name="sizeHint" stdset="0">
<property name="indent"> <size>
<number>15</number> <width>20</width>
</property> <height>10</height>
</widget> </size>
</item> </property>
<item> </spacer>
<spacer name="verticalSpacer"> </item>
<property name="orientation"> <item>
<enum>Qt::Vertical</enum> <widget class="QLabel" name="welcomeStartLabel">
</property> <property name="font">
<property name="sizeHint" stdset="0"> <font>
<size> <pointsize>9</pointsize>
<width>20</width> </font>
<height>40</height> </property>
</size> <property name="text">
</property> <string comment="res">IDS_MNU_START</string>
</spacer> </property>
</item> <property name="indent">
</layout> <number>15</number>
</widget> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</widget> <widget class="QLabel" name="welcomeNewLabel">
</widget> <property name="text">
<string comment="res">IDS_MNU_NEW</string>
</property>
<property name="indent">
<number>25</number>
</property>
<property name="textInteractionFlags">
<set>Qt::TextBrowserInteraction</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="welcomeOpenLabel">
<property name="text">
<string comment="res">IDS_MNU_OPEN</string>
</property>
<property name="indent">
<number>25</number>
</property>
<property name="textInteractionFlags">
<set>Qt::TextBrowserInteraction</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="welcomeExploreUserPathLabel">
<property name="text">
<string comment="res">IDS_MNU_EXPLOREUSERPATH</string>
</property>
<property name="indent">
<number>25</number>
</property>
<property name="textInteractionFlags">
<set>Qt::TextBrowserInteraction</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="welcomeRecentLabel">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="text">
<string comment="res">IDS_MNU_RECENT</string>
</property>
<property name="indent">
<number>15</number>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget> </widget>
<widget class="QMenuBar" name="menubar"> <widget class="QMenuBar" name="menubar">
<property name="geometry"> <property name="geometry">
@ -770,6 +742,9 @@
<property name="toolTip"> <property name="toolTip">
<string comment="res">IDS_TEXT_UNPAUSETHEGAME</string> <string comment="res">IDS_TEXT_UNPAUSETHEGAME</string>
</property> </property>
<property name="shortcut">
<string/>
</property>
</action> </action>
<action name="actionPause"> <action name="actionPause">
<property name="checkable"> <property name="checkable">
@ -810,7 +785,7 @@
<string comment="res">IDS_TEXT_CURSOR_GAME</string> <string comment="res">IDS_TEXT_CURSOR_GAME</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>1</string> <string>Ctrl+1</string>
</property> </property>
</action> </action>
<action name="actionCursorSelect"> <action name="actionCursorSelect">
@ -831,7 +806,7 @@
<string comment="res">IDS_TEXT_CURSOR_SELECT</string> <string comment="res">IDS_TEXT_CURSOR_SELECT</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>2</string> <string>Ctrl+2</string>
</property> </property>
</action> </action>
<action name="actionCursorDrawPen"> <action name="actionCursorDrawPen">
@ -852,7 +827,7 @@
<string comment="res">IDS_TEXT_CURSOR_DRAWPEN</string> <string comment="res">IDS_TEXT_CURSOR_DRAWPEN</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>4</string> <string>Ctrl+4</string>
</property> </property>
</action> </action>
<action name="actionCursorDrawLine"> <action name="actionCursorDrawLine">
@ -873,7 +848,7 @@
<string comment="res">IDS_TEXT_CURSOR_DRAWLINE</string> <string comment="res">IDS_TEXT_CURSOR_DRAWLINE</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>5</string> <string>Ctrl+5</string>
</property> </property>
</action> </action>
<action name="actionCursorDrawRect"> <action name="actionCursorDrawRect">
@ -894,7 +869,7 @@
<string comment="res">IDS_TEXT_CURSOR_DRAWRECT</string> <string comment="res">IDS_TEXT_CURSOR_DRAWRECT</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>6</string> <string>Ctrl+6</string>
</property> </property>
</action> </action>
<action name="actionCursorPicker"> <action name="actionCursorPicker">
@ -915,7 +890,7 @@
<string comment="res">IDS_TEXT_CURSOR_DRAWPICKER</string> <string comment="res">IDS_TEXT_CURSOR_DRAWPICKER</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>8</string> <string>Ctrl+8</string>
</property> </property>
</action> </action>
<action name="actionDynamicLandscape"> <action name="actionDynamicLandscape">
@ -993,7 +968,7 @@
<string comment="res">IDS_TEXT_CURSOR_DRAWFILL</string> <string comment="res">IDS_TEXT_CURSOR_DRAWFILL</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>7</string> <string>Ctrl+7</string>
</property> </property>
</action> </action>
<action name="actionViewportNew"> <action name="actionViewportNew">
@ -1096,7 +1071,7 @@
<string comment="res">IDS_TEXT_CURSOR_CREATOR</string> <string comment="res">IDS_TEXT_CURSOR_CREATOR</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>3</string> <string>Ctrl+3</string>
</property> </property>
</action> </action>
<action name="actionFileNew"> <action name="actionFileNew">