kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: restore fixes of DlgKeyboard.ui and DlgToolbars.ui and fix build failure

Browse Source
This commit is contained in:
wmayer
2022-11-10 19:07:22 +01:00
committed by wwmayer
parent 2138189f8e
commit ee4e64328e
3 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/Gui/DlgKeyboard.ui
View File

@@ -33,8 +33,8 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item row="2" column="1">
<widget class="QComboBox" name="categoryBox"/>
<item row="1" column="0" colspan="2">
<widget class="QLineEdit" name="editCommand"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabelCategory">
@@ -52,8 +52,8 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLineEdit" name="editCommand"/>
<item row="2" column="1">
<widget class="QComboBox" name="categoryBox"/>
</item>
<item row="3" column="0" colspan="2">
<widget class="QTreeWidget" name="commandTreeWidget">
@@ -94,6 +94,37 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="1">
<widget class="QLabel" name="textLabelShortcut">
<property name="text">
<string>Current shortcut:</string>
</property>
</widget>
</item>
<item row="1" column="2" colspan="2">
<widget class="Gui::AccelLineEdit" name="accelLineEditShortcut">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="textLabelNewShortcut">
<property name="text">
<string>&amp;New shortcut:</string>
</property>
<property name="buddy">
<cstring>editShortcut</cstring>
</property>
</widget>
</item>
<item>
<widget class="Gui::AccelLineEdit" name="editShortcut"/>
</item>
</layout>
</item>
<item row="4" column="1" colspan="2">
<widget class="QLabel" name="label">
<property name="toolTip">
@@ -104,13 +135,6 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="textLabelShortcut">
<property name="text">
<string>Current shortcut:</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="Gui::PrefSpinBox" name="shortcutTimeout">
<property name="sizePolicy">
@@ -147,6 +171,24 @@ be treated as shorctcut key sequence 'F, F'.</string>
</property>
</widget>
</item>
<item row="5" column="1" colspan="3">
<widget class="QLabel" name="textLabelAssigned">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="toolTip">
<string>This list shows commands having the same shortcut in the priority from high
to low. If more than one command with the same shortcut are active at the
same time. The one with the highest prioirty will be triggered.</string>
</property>
<property name="text">
<string>Shorcut priority list:</string>
</property>
</widget>
</item>
<item row="6" column="1" colspan="3">
<widget class="QTreeWidget" name="assignedTreeWidget">
<property name="minimumSize">
@@ -168,48 +210,6 @@ be treated as shorctcut key sequence 'F, F'.</string>
</column>
</widget>
</item>
<item row="1" column="2" colspan="2">
<widget class="Gui::AccelLineEdit" name="accelLineEditShortcut">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="textLabelNewShortcut">
<property name="text">
<string>&amp;New shortcut:</string>
</property>
<property name="buddy">
<cstring>editShortcut</cstring>
</property>
</widget>
</item>
<item>
<widget class="Gui::AccelLineEdit" name="editShortcut"/>
</item>
</layout>
</item>
<item row="5" column="1" colspan="3">
<widget class="QLabel" name="textLabelAssigned">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="toolTip">
<string>This list shows commands having the same shortcut in the priority from high
to low. If more than one command with the same shortcut are active at the
same time. The one with the highest prioirty will be triggered.</string>
</property>
<property name="text">
<string>Shorcut priority list:</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
@@ -328,11 +328,12 @@ same time. The one with the highest prioirty will be triggered.</string>
<tabstop>categoryBox</tabstop>
<tabstop>commandTreeWidget</tabstop>
<tabstop>accelLineEditShortcut</tabstop>
<tabstop>editShortcut</tabstop>
<tabstop>shortcutTimeout</tabstop>
<tabstop>buttonAssign</tabstop>
<tabstop>buttonClear</tabstop>
<tabstop>buttonReset</tabstop>
<tabstop>buttonResetAll</tabstop>
<tabstop>shortcutTimeout</tabstop>
<tabstop>assignedTreeWidget</tabstop>
<tabstop>buttonUp</tabstop>
<tabstop>buttonDown</tabstop>

8
src/Gui/DlgToolbars.ui
View File

File diff suppressed because one or more lines are too long

2
src/Gui/DlgToolbarsImp.cpp
View File

@@ -209,7 +209,7 @@ void DlgCustomToolbars::importCustomToolbars(const QByteArray& name)
auto* item = new QTreeWidgetItem(toplevel);
item->setText(0, Action::commandMenuText(pCmd));
item->setToolTip(0, Action::commandToolTip(pCmd));
item->setData(0, Qt::UserRole, QByteArray(it2->first.c_str()));
item->setData(0, Qt::UserRole, QByteArray(it2.first.c_str()));
if (pCmd->getPixmap())
item->setIcon(0, BitmapFactory().iconFromTheme(pCmd->getPixmap()));
item->setSizeHint(0, QSize(32, 32));