Skip to content

Commit 0d7780b

Browse files
lasconiclasconic
authored
Merge pull request #3255 from aryamanvinchhi/startup
Formatting and Bug Fixes
2 parents 87752dd + df3adc5 commit 0d7780b

File tree

4 files changed

+46
-49
lines changed

4 files changed

+46
-49
lines changed

‎mscore/musescore.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6219,9 +6219,10 @@ int main(int argc, char* av[])
62196219
for (auto ws : Workspace::workspaces()) {
62206220
if (ws->name().compare(sw->workspace()) == 0) {
62216221
mscore->changeWorkspace(ws);
6222+
preferences.workspace = ws->name();
62226223
mscore->getPaletteBox()->updateWorkspaces();
6224+
}
62236225
}
6224-
}
62256226
delete sw;
62266227
}
62276228
QString keyboardLayout = s.value("keyboardLayout").toString();

‎mscore/musescore.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,10 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
230230
std::list<const char*> _noteInputMenuEntries { _allNoteInputMenuEntries };
231231

232232
static const std::list<const char*> _allFileOperationEntries;
233-
std::list<const char*> _fileOperationEntries {_allFileOperationEntries };
233+
std::list<const char*> _fileOperationEntries { _allFileOperationEntries };
234234

235235
static const std::list<const char*> _allPlaybackControlEntries;
236-
std::list<const char*> _playbackControlEntries {_allPlaybackControlEntries};
236+
std::list<const char*> _playbackControlEntries { _allPlaybackControlEntries };
237237

238238
QVBoxLayout* layout; // main window layout
239239
QSplitter* splitter;
@@ -759,11 +759,11 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
759759
static const std::list<const char*>& advancedNoteInputMenuEntries() { return _advancedNoteInputMenuEntries; }
760760
std::list<const char*>* noteInputMenuEntries() { return &_noteInputMenuEntries; }
761761

762-
static const std::list<const char*>& allFileOperationEntries() {return _allFileOperationEntries;}
763-
std::list<const char*>* fileOperationEntries() {return &_fileOperationEntries;}
762+
static const std::list<const char*>& allFileOperationEntries() { return _allFileOperationEntries; }
763+
std::list<const char*>* fileOperationEntries() { return &_fileOperationEntries; }
764764

765-
static const std::list<const char*>& allPlaybackControlEntries() {return _allPlaybackControlEntries;}
766-
std::list<const char*>* playbackControlEntries() {return &_playbackControlEntries;}
765+
static const std::list<const char*>& allPlaybackControlEntries() { return _allPlaybackControlEntries; }
766+
std::list<const char*>* playbackControlEntries() { return &_playbackControlEntries; }
767767

768768
void setNoteInputMenuEntries(std::list<const char*> l) { _noteInputMenuEntries = l; }
769769
void populateNoteInputMenu();

‎mscore/startupWizard.cpp

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const static QMap<QString, QString> langToLayout = {
6464
};
6565

6666
StartupWizardIntroPage::StartupWizardIntroPage(QWidget* parent)
67-
: QWizardPage(parent)
67+
: QWizardPage(parent)
6868
{
6969
setTitle(tr("Welcome to MuseScore!"));
7070
QLabel* label = new QLabel(tr("This wizard will help you choose settings for MuseScore based on your locale,\n music level, and personal preferences."), this);
@@ -74,7 +74,7 @@ StartupWizardIntroPage::StartupWizardIntroPage(QWidget* parent)
7474
}
7575

7676
StartupWizardPage1::StartupWizardPage1(QWidget* parent)
77-
: QWizardPage(parent)
77+
: QWizardPage(parent)
7878
{
7979
setTitle(tr("Language"));
8080
QLabel* label = new QLabel(tr("Choose your language"), this);
@@ -103,9 +103,8 @@ QString StartupWizardPage1::language()
103103
QString StartupWizardPage1::getCurrentLangCode()
104104
{
105105
int index = QWizardPage::field("langIndex").toInt();
106-
if (_languages->itemData(index).toString().compare("system") == 0) {
106+
if (_languages->itemData(index).toString().compare("system") == 0)
107107
return mscore->getLocaleISOCode();
108-
}
109108
return _languages->itemData(index).toString();
110109
}
111110

@@ -116,9 +115,8 @@ StartupWizardPage2::StartupWizardPage2(QWidget* parent)
116115
QLabel* label = new QLabel(tr("Enter your keyboard layout"), this);
117116
QStringList layoutList;
118117
QList<QString> keyboardLayouts = layoutToShortcut.keys();
119-
for (auto layout : keyboardLayouts) {
118+
for (auto layout : keyboardLayouts)
120119
layoutList.append(qApp->translate("keyboard-layout", layout.toStdString().c_str()));
121-
}
122120
_keyLayouts = new QComboBox(this);
123121
_keyLayouts->addItems(layoutList);
124122
int targetIndex = layoutList.indexOf("US - International", 0);
@@ -136,22 +134,20 @@ void StartupWizardPage2::setCurrentLayout(QString langCode)
136134
QString bestLayout = langToLayout.value(langCode, "US - International");
137135
QStringList layoutList;
138136
QList<QString> keyboardLayouts = layoutToShortcut.keys();
139-
for (auto layout : keyboardLayouts) {
137+
for (auto layout : keyboardLayouts)
140138
layoutList.append(qApp->translate("keyboard-layout", layout.toStdString().c_str()));
141-
}
142139
int targetIndex = layoutList.indexOf(bestLayout);
143140
_keyLayouts->setCurrentIndex(targetIndex);
144141
}
145142

146143
StartupWizardPage3::StartupWizardPage3(QWidget* parent)
147-
: QWizardPage(parent)
144+
: QWizardPage(parent)
148145
{
149146
setTitle(tr("Workspace"));
150147
QLabel* label = new QLabel(tr("Choose your workspace"), this);
151148
QStringList workspaceList;
152-
for (auto workspace : Workspace::workspaces()) {
149+
for (auto workspace : Workspace::workspaces())
153150
workspaceList.append(qApp->translate("workspace", workspace->name().toStdString().c_str()));
154-
}
155151
_workspaces = new QComboBox(this);
156152
_workspaces->addItems(workspaceList);
157153
QVBoxLayout* layout = new QVBoxLayout(this);
@@ -161,7 +157,7 @@ StartupWizardPage3::StartupWizardPage3(QWidget* parent)
161157
}
162158

163159
StartupWizardFinalPage::StartupWizardFinalPage(QWidget* parent)
164-
: QWizardPage(parent)
160+
: QWizardPage(parent)
165161
{
166162
setTitle(tr("Thank you!"));
167163
QLabel* label = new QLabel(tr("Your preferences have been saved. Click \"Finish\" to start using MuseScore."), this);
@@ -171,7 +167,7 @@ StartupWizardFinalPage::StartupWizardFinalPage(QWidget* parent)
171167
}
172168

173169
StartupWizard::StartupWizard(QWidget* parent)
174-
: QWizard(parent)
170+
: QWizard(parent)
175171
{
176172
setObjectName("StartupWizard");
177173
setWizardStyle(QWizard::ClassicStyle);

‎mscore/startupWizard.h

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,53 +26,53 @@ namespace Ms {
2626
class StartupWizardIntroPage : public QWizardPage {
2727
Q_OBJECT
2828

29-
public:
30-
StartupWizardIntroPage(QWidget* parent = 0);
31-
void init();
29+
public:
30+
StartupWizardIntroPage(QWidget* parent = 0);
31+
void init();
3232
};
3333

3434
class StartupWizardPage1 : public QWizardPage {
3535
Q_OBJECT
3636

3737
QComboBox* _languages;
3838

39-
public:
40-
StartupWizardPage1(QWidget* parent = 0);
41-
QString language();
42-
void init();
43-
QComboBox* getLanguages() {return _languages;}
44-
QString getCurrentLangCode();
39+
public:
40+
StartupWizardPage1(QWidget* parent = 0);
41+
QString language();
42+
void init();
43+
QComboBox* getLanguages() { return _languages; }
44+
QString getCurrentLangCode();
4545
};
4646

4747
class StartupWizardPage2 : public QWizardPage {
4848
Q_OBJECT
4949

5050
QComboBox* _keyLayouts;
5151

52-
public:
53-
StartupWizardPage2(QWidget* parent = 0);
54-
QString keyboardLayout() {return _keyLayouts->currentText();}
55-
void init();
56-
void setCurrentLayout(QString langCode);
52+
public:
53+
StartupWizardPage2(QWidget* parent = 0);
54+
QString keyboardLayout() { return _keyLayouts->currentText(); }
55+
void init();
56+
void setCurrentLayout(QString langCode);
5757
};
5858

5959
class StartupWizardPage3 : public QWizardPage {
6060
Q_OBJECT
6161

6262
QComboBox* _workspaces;
6363

64-
public:
65-
StartupWizardPage3(QWidget* parent = 0);
66-
QString workspace() {return _workspaces->currentText();}
67-
void init();
64+
public:
65+
StartupWizardPage3(QWidget* parent = 0);
66+
QString workspace() { return _workspaces->currentText(); }
67+
void init();
6868
};
6969

7070
class StartupWizardFinalPage : public QWizardPage {
7171
Q_OBJECT
7272

73-
public:
74-
StartupWizardFinalPage(QWidget* parent = 0);
75-
void init();
73+
public:
74+
StartupWizardFinalPage(QWidget* parent = 0);
75+
void init();
7676
};
7777

7878
class StartupWizard : public QWizard {
@@ -84,15 +84,15 @@ class StartupWizard : public QWizard {
8484
StartupWizardPage3* p3;
8585
StartupWizardFinalPage* p4;
8686

87-
public:
88-
StartupWizard(QWidget* parent = 0);
89-
static void autoSelectShortcuts(QString keyboardLayout);
90-
QString keyboardLayout() {return p2->keyboardLayout();}
91-
QString language() {return p1->language();}
92-
QString workspace() {return p3->workspace();}
87+
public:
88+
StartupWizard(QWidget* parent = 0);
89+
static void autoSelectShortcuts(QString keyboardLayout);
90+
QString keyboardLayout() { return p2->keyboardLayout(); }
91+
QString language() { return p1->language(); }
92+
QString workspace() { return p3->workspace(); }
9393

94-
private slots:
95-
void langChanged();
94+
private slots:
95+
void langChanged();
9696
};
9797
}
9898
#endif

0 commit comments

Comments
 (0)