summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
Diffstat (limited to 'muse2')
-rw-r--r--muse2/muse/cobject.cpp2
-rw-r--r--muse2/muse/midiedit/scoreedit.cpp2
-rw-r--r--muse2/muse/widgets/genset.cpp50
-rw-r--r--muse2/muse/widgets/genset.h2
-rw-r--r--muse2/muse/widgets/gensetbase.ui14
5 files changed, 35 insertions, 35 deletions
diff --git a/muse2/muse/cobject.cpp b/muse2/muse/cobject.cpp
index 7f4af8a2..318c4bc2 100644
--- a/muse2/muse/cobject.cpp
+++ b/muse2/muse/cobject.cpp
@@ -263,6 +263,8 @@ void TopWin::addToolBar(QToolBar* toolbar)
QMainWindow::addToolBar(toolbar);
else
toolbar->hide();
+
+ toolbar->setIconSize(ICON_SIZE);
}
QToolBar* TopWin::addToolBar(const QString& title)
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index a4b9eb1b..6a0f2d87 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -4451,8 +4451,6 @@ void staff_t::update_part_indices()
* CURRENT TODO
* M o remove that ugly "bool initalizing" stuff. it's probably unneeded (watch out for the FINDMICH message)
* m o shortcuts, especially for fullscreen
- * o fix saving muse main win settings in global config dialog
- * o strange sizes of toolbars oO?
* o mirror most menus to an additional right-click context menu to avoid the long mouse pointer
* journey to the menu bar. try to find a way which does not involve duplicate code!
* o implement borland-style maximize: free windows do not cover the main menu, even when maximized
diff --git a/muse2/muse/widgets/genset.cpp b/muse2/muse/widgets/genset.cpp
index 3aff8247..9510f580 100644
--- a/muse2/muse/widgets/genset.cpp
+++ b/muse2/muse/widgets/genset.cpp
@@ -112,10 +112,10 @@ Shorter periods are desirable.</string>
showMixer->setChecked(config.mixer1Visible);
showMixer2->setChecked(config.mixer2Visible);
- arrangerX->setValue(config.geometryMain.x());
- arrangerY->setValue(config.geometryMain.y());
- arrangerW->setValue(config.geometryMain.width());
- arrangerH->setValue(config.geometryMain.height());
+ mainX->setValue(config.geometryMain.x());
+ mainY->setValue(config.geometryMain.y());
+ mainW->setValue(config.geometryMain.width());
+ mainH->setValue(config.geometryMain.height());
transportX->setValue(config.geometryTransport.x());
transportY->setValue(config.geometryTransport.y());
@@ -161,7 +161,7 @@ Shorter periods are desirable.</string>
connect(setMixerCurrent, SIGNAL(clicked()), SLOT(mixerCurrent()));
connect(setMixer2Current, SIGNAL(clicked()), SLOT(mixer2Current()));
connect(setBigtimeCurrent, SIGNAL(clicked()), SLOT(bigtimeCurrent()));
- connect(setArrangerCurrent, SIGNAL(clicked()), SLOT(arrangerCurrent()));
+ connect(setMainCurrent, SIGNAL(clicked()), SLOT(mainCurrent()));
connect(setTransportCurrent, SIGNAL(clicked()), SLOT(transportCurrent()));
connect(buttonTraditionalPreset, SIGNAL(clicked()), SLOT(traditionalPreset()));
@@ -248,10 +248,10 @@ void GlobalSettingsConfig::updateSettings()
showMixer->setChecked(config.mixer1Visible);
showMixer2->setChecked(config.mixer2Visible);
- arrangerX->setValue(config.geometryMain.x());
- arrangerY->setValue(config.geometryMain.y());
- arrangerW->setValue(config.geometryMain.width());
- arrangerH->setValue(config.geometryMain.height());
+ mainX->setValue(config.geometryMain.x());
+ mainY->setValue(config.geometryMain.y());
+ mainW->setValue(config.geometryMain.width());
+ mainH->setValue(config.geometryMain.height());
transportX->setValue(config.geometryTransport.x());
transportY->setValue(config.geometryTransport.y());
@@ -349,10 +349,10 @@ void GlobalSettingsConfig::apply()
config.mixer1Visible = showMixer->isChecked();
config.mixer2Visible = showMixer2->isChecked();
- config.geometryMain.setX(arrangerX->value());
- config.geometryMain.setY(arrangerY->value());
- config.geometryMain.setWidth(arrangerW->value());
- config.geometryMain.setHeight(arrangerH->value());
+ config.geometryMain.setX(mainX->value());
+ config.geometryMain.setY(mainY->value());
+ config.geometryMain.setWidth(mainW->value());
+ config.geometryMain.setHeight(mainH->value());
config.geometryTransport.setX(transportX->value());
config.geometryTransport.setY(transportY->value());
@@ -460,8 +460,8 @@ void GlobalSettingsConfig::mixerCurrent()
QRect r(w->frameGeometry());
mixerX->setValue(r.x());
mixerY->setValue(r.y());
- mixerW->setValue(r.width());
- mixerH->setValue(r.height());
+ mixerW->setValue(w->width());
+ mixerH->setValue(w->height());
}
//---------------------------------------------------------
@@ -476,8 +476,8 @@ void GlobalSettingsConfig::mixer2Current()
QRect r(w->frameGeometry());
mixer2X->setValue(r.x());
mixer2Y->setValue(r.y());
- mixer2W->setValue(r.width());
- mixer2H->setValue(r.height());
+ mixer2W->setValue(w->width());
+ mixer2H->setValue(w->height());
}
//---------------------------------------------------------
@@ -492,21 +492,21 @@ void GlobalSettingsConfig::bigtimeCurrent()
QRect r(w->frameGeometry());
bigtimeX->setValue(r.x());
bigtimeY->setValue(r.y());
- bigtimeW->setValue(r.width());
- bigtimeH->setValue(r.height());
+ bigtimeW->setValue(w->width());
+ bigtimeH->setValue(w->height());
}
//---------------------------------------------------------
-// arrangerCurrent
+// mainCurrent
//---------------------------------------------------------
-void GlobalSettingsConfig::arrangerCurrent()
+void GlobalSettingsConfig::mainCurrent()
{
QRect r(muse->frameGeometry());
- arrangerX->setValue(r.x());
- arrangerY->setValue(r.y());
- arrangerW->setValue(r.width());
- arrangerH->setValue(r.height());
+ mainX->setValue(r.x());
+ mainY->setValue(r.y());
+ mainW->setValue(muse->width()); //this is intendedly not the frameGeometry, but
+ mainH->setValue(muse->height()); //the "non-frame-geom." to avoid a sizing bug
}
//---------------------------------------------------------
diff --git a/muse2/muse/widgets/genset.h b/muse2/muse/widgets/genset.h
index bc9ed1dd..9c636c67 100644
--- a/muse2/muse/widgets/genset.h
+++ b/muse2/muse/widgets/genset.h
@@ -34,7 +34,7 @@ class GlobalSettingsConfig : public QDialog, public Ui::GlobalSettingsDialogBase
void mixerCurrent();
void mixer2Current();
void bigtimeCurrent();
- void arrangerCurrent();
+ void mainCurrent();
void transportCurrent();
void selectInstrumentsPath();
void defaultInstrumentsPath();
diff --git a/muse2/muse/widgets/gensetbase.ui b/muse2/muse/widgets/gensetbase.ui
index 3d15aaa5..b5fb56b6 100644
--- a/muse2/muse/widgets/gensetbase.ui
+++ b/muse2/muse/widgets/gensetbase.ui
@@ -23,7 +23,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
- <number>3</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="TabPage">
<attribute name="title">
@@ -70,7 +70,7 @@
</widget>
</item>
<item row="0" column="5">
- <widget class="QSpinBox" name="arrangerH">
+ <widget class="QSpinBox" name="mainH">
<property name="toolTip">
<string>height</string>
</property>
@@ -80,7 +80,7 @@
</widget>
</item>
<item row="0" column="4">
- <widget class="QSpinBox" name="arrangerW">
+ <widget class="QSpinBox" name="mainW">
<property name="toolTip">
<string>width</string>
</property>
@@ -90,7 +90,7 @@
</widget>
</item>
<item row="0" column="3">
- <widget class="QSpinBox" name="arrangerY">
+ <widget class="QSpinBox" name="mainY">
<property name="toolTip">
<string>y-pos</string>
</property>
@@ -100,7 +100,7 @@
</widget>
</item>
<item row="0" column="2">
- <widget class="QSpinBox" name="arrangerX">
+ <widget class="QSpinBox" name="mainX">
<property name="toolTip">
<string>x-pos</string>
</property>
@@ -227,7 +227,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Arranger</string>
+ <string>Main Window</string>
</property>
<property name="wordWrap">
<bool>false</bool>
@@ -379,7 +379,7 @@
</widget>
</item>
<item row="0" column="6">
- <widget class="QPushButton" name="setArrangerCurrent">
+ <widget class="QPushButton" name="setMainCurrent">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 19:30:00 +0000