summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-08-28 21:52:19 +0200
committerPetr Mrázek <peterix@gmail.com>2013-08-28 21:52:19 +0200
commit78e278c1e33e39eb29a26a976b19ea6a8150bfff (patch)
tree05c9c5a591b706d086930105b0e187e6266f0bb4 /gui
parent93bb7c87e3274124465f0858c20091784f84edb1 (diff)
downloadMultiMC-78e278c1e33e39eb29a26a976b19ea6a8150bfff.tar
MultiMC-78e278c1e33e39eb29a26a976b19ea6a8150bfff.tar.gz
MultiMC-78e278c1e33e39eb29a26a976b19ea6a8150bfff.tar.lz
MultiMC-78e278c1e33e39eb29a26a976b19ea6a8150bfff.tar.xz
MultiMC-78e278c1e33e39eb29a26a976b19ea6a8150bfff.zip
Misc tweaks
* Do not nuke forge META-INF * Disable inner DnD in mod lists on linux.
Diffstat (limited to 'gui')
-rw-r--r--gui/LegacyModEditDialog.cpp4
-rw-r--r--gui/mainwindow.cpp6
2 files changed, 6 insertions, 4 deletions
diff --git a/gui/LegacyModEditDialog.cpp b/gui/LegacyModEditDialog.cpp
index f1e0af6f..616fc050 100644
--- a/gui/LegacyModEditDialog.cpp
+++ b/gui/LegacyModEditDialog.cpp
@@ -35,12 +35,12 @@ LegacyModEditDialog::LegacyModEditDialog( LegacyInstance* inst, QWidget* parent
ensureFolderPathExists(m_inst->jarModsDir());
m_jarmods = m_inst->jarModList();
ui->jarModsTreeView->setModel(m_jarmods.data());
-
+#ifndef Q_OS_LINUX
// FIXME: internal DnD causes segfaults later
ui->jarModsTreeView->setDragDropMode(QAbstractItemView::DragDrop);
// FIXME: DnD is glitched with contiguous (we move only first item in selection)
ui->jarModsTreeView->setSelectionMode(QAbstractItemView::SingleSelection);
-
+#endif
ui->jarModsTreeView->installEventFilter( this );
m_jarmods->startWatching();
}
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index cef5f278..7cdf93ad 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -410,9 +410,11 @@ void MainWindow::on_actionRenameInstance_triggered()
if (name.length() > 0)
{
- if(ok && name.length() && name.length() <= 25)
+ if(ok && name.length())
+ {
m_selectedInstance->setName(name);
- renameButton->setText(name);
+ renameButton->setText(name);
+ }
}
}