diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-08 22:18:32 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-08 22:18:32 +0100 |
| commit | af33b966848687048f0a9e409444bc1b1f7d12df (patch) | |
| tree | c978a58fddbcf1e6566f309f67579264ffdd4168 /gui/MainWindow.cpp | |
| parent | 53069205faf4063e838bab4beea5089d6ec2a0af (diff) | |
| parent | aa41b891f06a629099d108ab1f4df94d1bbc828c (diff) | |
| download | MultiMC-af33b966848687048f0a9e409444bc1b1f7d12df.tar MultiMC-af33b966848687048f0a9e409444bc1b1f7d12df.tar.gz MultiMC-af33b966848687048f0a9e409444bc1b1f7d12df.tar.lz MultiMC-af33b966848687048f0a9e409444bc1b1f7d12df.tar.xz MultiMC-af33b966848687048f0a9e409444bc1b1f7d12df.zip | |
Merge branch 'feature_groupview' into integration_derpstances_groupview
Diffstat (limited to 'gui/MainWindow.cpp')
| -rw-r--r-- | gui/MainWindow.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 9977dc75..cd8ec926 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -26,6 +26,7 @@ #include <QInputDialog> #include <QDesktopServices> +#include <QKeyEvent> #include <QUrl> #include <QDir> #include <QFileInfo> @@ -37,12 +38,12 @@ #include "userutils.h" #include "pathutils.h" -#include "categorizedview.h" -#include "categorydrawer.h" +#include "gui/groupview/GroupView.h" +#include "gui/groupview/InstanceDelegate.h" #include "gui/Platform.h" -#include "gui/widgets/InstanceDelegate.h" + #include "gui/widgets/LabeledToolButton.h" #include "gui/dialogs/SettingsDialog.h" @@ -140,21 +141,21 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi // Create the instance list widget { - view = new KCategorizedView(ui->centralWidget); - drawer = new KCategoryDrawer(view); + view = new GroupView(ui->centralWidget); + view->setSelectionMode(QAbstractItemView::SingleSelection); - view->setCategoryDrawer(drawer); - view->setCollapsibleBlocks(true); - view->setViewMode(QListView::IconMode); - view->setFlow(QListView::LeftToRight); - view->setWordWrap(true); - view->setMouseTracking(true); - view->viewport()->setAttribute(Qt::WA_Hover); + // view->setCategoryDrawer(drawer); + // view->setCollapsibleBlocks(true); + // view->setViewMode(QListView::IconMode); + // view->setFlow(QListView::LeftToRight); + // view->setWordWrap(true); + // view->setMouseTracking(true); + // view->viewport()->setAttribute(Qt::WA_Hover); auto delegate = new ListViewDelegate(); view->setItemDelegate(delegate); - view->setSpacing(10); - view->setUniformItemWidths(true); + // view->setSpacing(10); + // view->setUniformItemWidths(true); // do not show ugly blue border on the mac view->setAttribute(Qt::WA_MacShowFocusRect, false); @@ -331,7 +332,6 @@ MainWindow::~MainWindow() { delete ui; delete proxymodel; - delete drawer; } void MainWindow::showInstanceContextMenu(const QPoint &pos) |