aboutsummaryrefslogtreecommitdiff
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/pages/global/MultiMCPage.cpp1
-rw-r--r--application/pages/instance/ScreenshotsPage.ui2
-rw-r--r--application/pages/instance/ServersPage.cpp1
-rw-r--r--application/pages/instance/ServersPage.ui2
-rw-r--r--application/pages/instance/VersionPage.ui2
-rw-r--r--application/pages/instance/WorldListPage.ui2
-rw-r--r--application/widgets/CustomCommands.cpp1
-rw-r--r--application/widgets/CustomCommands.h2
-rw-r--r--application/widgets/CustomCommands.ui3
-rw-r--r--application/widgets/InstanceCardWidget.ui3
10 files changed, 8 insertions, 11 deletions
diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp
index 541af287..3a8c46e8 100644
--- a/application/pages/global/MultiMCPage.cpp
+++ b/application/pages/global/MultiMCPage.cpp
@@ -83,6 +83,7 @@ MultiMCPage::MultiMCPage(QWidget *parent) : QWidget(parent), ui(new Ui::MultiMCP
MultiMCPage::~MultiMCPage()
{
delete ui;
+ delete defaultFormat;
}
bool MultiMCPage::apply()
diff --git a/application/pages/instance/ScreenshotsPage.ui b/application/pages/instance/ScreenshotsPage.ui
index 42d4db64..d0f5ec23 100644
--- a/application/pages/instance/ScreenshotsPage.ui
+++ b/application/pages/instance/ScreenshotsPage.ui
@@ -41,7 +41,7 @@
</widget>
<widget class="WideBar" name="toolBar">
<property name="windowTitle">
- <string>toolBar</string>
+ <string>Actions</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextOnly</enum>
diff --git a/application/pages/instance/ServersPage.cpp b/application/pages/instance/ServersPage.cpp
index c33eef1f..8b0c655c 100644
--- a/application/pages/instance/ServersPage.cpp
+++ b/application/pages/instance/ServersPage.cpp
@@ -597,6 +597,7 @@ ServersPage::ServersPage(MinecraftInstance * inst, QWidget* parent)
ServersPage::~ServersPage()
{
m_model->saveNow();
+ delete ui;
}
void ServersPage::ShowContextMenu(const QPoint& pos)
diff --git a/application/pages/instance/ServersPage.ui b/application/pages/instance/ServersPage.ui
index 9c31abe3..5fb18113 100644
--- a/application/pages/instance/ServersPage.ui
+++ b/application/pages/instance/ServersPage.ui
@@ -130,7 +130,7 @@
</widget>
<widget class="WideBar" name="toolBar">
<property name="windowTitle">
- <string>toolBar</string>
+ <string>Actions</string>
</property>
<property name="allowedAreas">
<set>Qt::LeftToolBarArea|Qt::RightToolBarArea</set>
diff --git a/application/pages/instance/VersionPage.ui b/application/pages/instance/VersionPage.ui
index e16f18bc..5a54a466 100644
--- a/application/pages/instance/VersionPage.ui
+++ b/application/pages/instance/VersionPage.ui
@@ -64,7 +64,7 @@
</widget>
<widget class="WideBar" name="toolBar">
<property name="windowTitle">
- <string>toolBar</string>
+ <string>Actions</string>
</property>
<property name="allowedAreas">
<set>Qt::LeftToolBarArea|Qt::RightToolBarArea</set>
diff --git a/application/pages/instance/WorldListPage.ui b/application/pages/instance/WorldListPage.ui
index b7a9e57a..78452045 100644
--- a/application/pages/instance/WorldListPage.ui
+++ b/application/pages/instance/WorldListPage.ui
@@ -59,7 +59,7 @@
</widget>
<widget class="WideBar" name="toolBar">
<property name="windowTitle">
- <string>toolBar</string>
+ <string>Actions</string>
</property>
<property name="allowedAreas">
<set>Qt::LeftToolBarArea|Qt::RightToolBarArea</set>
diff --git a/application/widgets/CustomCommands.cpp b/application/widgets/CustomCommands.cpp
index 9e7673fd..24bdc07d 100644
--- a/application/widgets/CustomCommands.cpp
+++ b/application/widgets/CustomCommands.cpp
@@ -3,6 +3,7 @@
CustomCommands::~CustomCommands()
{
+ delete ui;
}
CustomCommands::CustomCommands(QWidget* parent):
diff --git a/application/widgets/CustomCommands.h b/application/widgets/CustomCommands.h
index 451b2cc0..4d447f7b 100644
--- a/application/widgets/CustomCommands.h
+++ b/application/widgets/CustomCommands.h
@@ -28,7 +28,7 @@ class CustomCommands : public QWidget
public:
explicit CustomCommands(QWidget *parent = 0);
- ~CustomCommands();
+ virtual ~CustomCommands();
void initialize(bool checkable, bool checked, const QString & prelaunch, const QString & wrapper, const QString & postexit);
bool checked() const;
diff --git a/application/widgets/CustomCommands.ui b/application/widgets/CustomCommands.ui
index c302fe39..25b2681b 100644
--- a/application/widgets/CustomCommands.ui
+++ b/application/widgets/CustomCommands.ui
@@ -10,9 +10,6 @@
<height>646</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
diff --git a/application/widgets/InstanceCardWidget.ui b/application/widgets/InstanceCardWidget.ui
index 3ea3e85f..6eeeb076 100644
--- a/application/widgets/InstanceCardWidget.ui
+++ b/application/widgets/InstanceCardWidget.ui
@@ -10,9 +10,6 @@
<height>118</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" rowspan="2">
<widget class="QToolButton" name="iconButton">