Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/muse-sequencer/muse
Browse files Browse the repository at this point in the history
  • Loading branch information
@spamatica
spamatica committed Feb 12, 2021
2 parents 69a38d6 + 031b7aa commit ede12a2
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 29 deletions.
30 changes: 15 additions & 15 deletions muse3/muse/components/gensetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>7</number>
<number>0</number>
</property>
<widget class="QWidget" name="TabPage">
<attribute name="title">
Expand All @@ -83,7 +83,7 @@
<item row="0" column="0">
<widget class="QGroupBox" name="projDirGroupBox">
<property name="title">
<string>Project directory</string>
<string>Global project folder</string>
</property>
<layout class="QHBoxLayout" name="qhboxProjDir">
<property name="spacing">
Expand Down Expand Up @@ -130,7 +130,7 @@
<item>
<widget class="QToolButton" name="startSongFileOpenToolButton">
<property name="toolTip">
<string>Choose start song or template</string>
<string>Choose initial project or template</string>
</property>
<property name="text">
<string>...</string>
Expand All @@ -152,13 +152,13 @@
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="startSongBox">
<property name="title">
<string>Start song</string>
<string>Initial project</string>
</property>
<layout class="QHBoxLayout" name="hLayout_1">
<item>
<widget class="QRadioButton" name="startLastButton">
<property name="text">
<string>Start with &amp;last song</string>
<string>Start with &amp;last project</string>
</property>
<property name="checked">
<bool>true</bool>
Expand All @@ -184,7 +184,7 @@
<item>
<widget class="QRadioButton" name="startSongButton">
<property name="text">
<string>Sta&amp;rt with song</string>
<string>Sta&amp;rt with project</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -223,7 +223,7 @@
<item row="2" column="0">
<widget class="QLabel" name="textLabel1_2">
<property name="text">
<string>Start template or song:</string>
<string>Start template or project:</string>
</property>
<property name="wordWrap">
<bool>false</bool>
Expand All @@ -237,7 +237,7 @@
or else automatically configure</string>
</property>
<property name="text">
<string>Read MIDI Ports configuration</string>
<string>Read MIDI ports configuration</string>
</property>
</widget>
</item>
Expand All @@ -246,7 +246,7 @@
<item row="0" column="0">
<widget class="QCheckBox" name="warnOnFileVersionsCheckBox">
<property name="text">
<string>Warn if opening file versions different than current version</string>
<string>Warn if opening file version is different than current version</string>
</property>
</widget>
</item>
Expand All @@ -264,7 +264,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
<height>20</height>
</size>
</property>
</spacer>
Expand Down Expand Up @@ -300,7 +300,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
<height>20</height>
</size>
</property>
</spacer>
Expand Down Expand Up @@ -1166,8 +1166,8 @@ Adjusts responsiveness of audio controls and
<rect>
<x>0</x>
<y>0</y>
<width>571</width>
<height>539</height>
<width>565</width>
<height>544</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_16">
Expand Down Expand Up @@ -1955,8 +1955,8 @@ Turn off to reduce clutter.</string>
<rect>
<x>0</x>
<y>0</y>
<width>545</width>
<height>487</height>
<width>543</width>
<height>503</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
Expand Down
23 changes: 13 additions & 10 deletions muse3/muse/components/projectcreate.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Base project folder</string>
<string>Global project folder</string>
</property>
</widget>
</item>
Expand All @@ -33,7 +33,7 @@
<item>
<widget class="QToolButton" name="projDirToolButton">
<property name="toolTip">
<string>Change Project-folder</string>
<string>Change Global project folder</string>
</property>
<property name="text">
<string>...</string>
Expand All @@ -57,7 +57,7 @@
<item row="0" column="2">
<widget class="QCheckBox" name="templateCheckBox">
<property name="toolTip">
<string>Checking this will cause the project to be saved in the templates folder</string>
<string>Project will be saved in user's Templates folder</string>
</property>
<property name="text">
<string>Project is a template</string>
Expand Down Expand Up @@ -104,7 +104,7 @@
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Project song file type</string>
<string>Main file type</string>
</property>
</widget>
</item>
Expand All @@ -131,7 +131,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Project path to song file:</string>
<string>Path to main file:</string>
</property>
</widget>
</item>
Expand All @@ -150,8 +150,11 @@
</item>
<item>
<widget class="QCheckBox" name="createFolderCheckbox">
<property name="toolTip">
<string>Recommended especially for audio projects to keep all project files in one folder</string>
</property>
<property name="text">
<string>&amp;Create project folder (recommended for audio projects)</string>
<string>&amp;Create project subfolder</string>
</property>
</widget>
</item>
Expand All @@ -172,7 +175,7 @@
<item row="0" column="1">
<widget class="QToolButton" name="browseDirButton">
<property name="toolTip">
<string>Edit folder for this project if you want it stored somewhere outside the regular Base project folder</string>
<string>Change folder for project files</string>
</property>
<property name="text">
<string>...</string>
Expand All @@ -182,7 +185,7 @@
<item row="0" column="2">
<widget class="QToolButton" name="restorePathButton">
<property name="toolTip">
<string>Restore project folder to what is set in the Base project folder</string>
<string>Reset to Global project folder</string>
</property>
<property name="text">
<string>...</string>
Expand All @@ -194,14 +197,14 @@
<item row="6" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Song information:</string>
<string>Project description:</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QPlainTextEdit" name="commentEdit">
<property name="toolTip">
<string>Add any information about this song, it will be displayed when the song is opened.</string>
<string>Add information about the song. It will be displayed when the song is opened.</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion muse3/muse/helper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2094,7 +2094,7 @@ void loadTheme(const QString& theme)
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 6)
// ugly hack to cope with Qt's menu styling bugs (kybos)
if (theme == "Dark Flat" || theme == "Deep Ocean")
sheet += "QMenu::item { padding-left: 22px; }";
sheet += "QMenu::item { padding-left: 26px; }";
#endif

qApp->setStyleSheet(sheet);
Expand Down
6 changes: 3 additions & 3 deletions muse3/share/themes/Dark Flat.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ QMenu::separator {

/* menu styling is incompatible between Qt releases */
QMenu::item {
padding: 3px 22px 3px 3px;
padding: 3px 22px 3px 7px;
}

QMenu::indicator {
left: 4px;
left: 6px;
border: 2px solid rgb(70, 70, 70);
}

Expand All @@ -65,7 +65,7 @@ QMenu::indicator:checked {
}

QMenu::icon {
left: 2px;
left: 4px;
border: 1px solid transparent;
}

Expand Down

0 comments on commit ede12a2

Please sign in to comment.