diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-09 20:49:48 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-09 20:49:48 +0100 |
| commit | 1f6a484cb2368a5704cdb4820ac06194ea6d7e1a (patch) | |
| tree | f4ebfd97c25387b3e26d4a55c5c85d67782df25d /gui/MainWindow.cpp | |
| parent | f8df07c3272c0e02f31f46fda8a429292c7a446a (diff) | |
| parent | 18f532b0d7d873280ec17218196db15fa64175a2 (diff) | |
| download | MultiMC-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar MultiMC-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar.gz MultiMC-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar.lz MultiMC-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar.xz MultiMC-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.zip | |
Merge branch 'integration_derpstances_groupview' into develop
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) |