1 files changed, 53 insertions, 52 deletions

diff --git a/application/pages/instance/WorldListPage.h b/application/pages/instance/WorldListPage.h
index 71b87bda..c39420da 100644
--- a/application/pages/instance/WorldListPage.h
+++ b/application/pages/instance/WorldListPage.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2018 MultiMC Contributors
+/* Copyright 2015-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QMainWindow>
 
 #include "minecraft/MinecraftInstance.h"
 #include "pages/BasePage.h"
@@ -28,69 +28,70 @@ namespace Ui
 class WorldListPage;
 }
 
-class WorldListPage : public QWidget, public BasePage
+class WorldListPage : public QMainWindow, public BasePage
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit WorldListPage(BaseInstance *inst, std::shared_ptr<WorldList> worlds, QString id,
-						   QString iconName, QString displayName, QString helpPage = "",
-						   QWidget *parent = 0);
-	virtual ~WorldListPage();
+    explicit WorldListPage(
+        BaseInstance *inst,
+        std::shared_ptr<WorldList> worlds,
+        QWidget *parent = 0
+    );
+    virtual ~WorldListPage();
 
-	virtual QString displayName() const override
-	{
-		return m_displayName;
-	}
-	virtual QIcon icon() const override
-	{
-		return MMC->getThemedIcon(m_iconName);
-	}
-	virtual QString id() const override
-	{
-		return m_id;
-	}
-	virtual QString helpPage() const override
-	{
-		return m_helpName;
-	}
-	virtual bool shouldDisplay() const override;
+    virtual QString displayName() const override
+    {
+        return tr("Worlds");
+    }
+    virtual QIcon icon() const override
+    {
+        return MMC->getThemedIcon("worlds");
+    }
+    virtual QString id() const override
+    {
+        return "worlds";
+    }
+    virtual QString helpPage() const override
+    {
+        return "Worlds";
+    }
+    virtual bool shouldDisplay() const override;
 
-	virtual void openedImpl() override;
-	virtual void closedImpl() override;
+    virtual void openedImpl() override;
+    virtual void closedImpl() override;
 
 protected:
-	bool eventFilter(QObject *obj, QEvent *ev) override;
-	bool worldListFilter(QKeyEvent *ev);
+    bool eventFilter(QObject *obj, QEvent *ev) override;
+    bool worldListFilter(QKeyEvent *ev);
+    QMenu * createPopupMenu() override;
 
 protected:
-	BaseInstance *m_inst;
+    BaseInstance *m_inst;
 
 private:
-	QModelIndex getSelectedWorld();
-	bool isWorldSafe(QModelIndex index);
-	bool worldSafetyNagQuestion();
-	void mceditError();
+    QModelIndex getSelectedWorld();
+    bool isWorldSafe(QModelIndex index);
+    bool worldSafetyNagQuestion();
+    void mceditError();
 
 private:
-	Ui::WorldListPage *ui;
-	std::shared_ptr<WorldList> m_worlds;
-	unique_qobject_ptr<LoggedProcess> m_mceditProcess;
-	bool m_mceditStarting = false;
-	QString m_iconName;
-	QString m_id;
-	QString m_displayName;
-	QString m_helpName;
+    Ui::WorldListPage *ui;
+    std::shared_ptr<WorldList> m_worlds;
+    unique_qobject_ptr<LoggedProcess> m_mceditProcess;
+    bool m_mceditStarting = false;
 
 private slots:
-	void on_copySeedBtn_clicked();
-	void on_mcEditBtn_clicked();
-	void on_rmWorldBtn_clicked();
-	void on_addBtn_clicked();
-	void on_copyBtn_clicked();
-	void on_renameBtn_clicked();
-	void on_refreshBtn_clicked();
-	void on_viewFolderBtn_clicked();
-	void worldChanged(const QModelIndex &current, const QModelIndex &previous);
-	void mceditState(LoggedProcess::State state);
+    void on_actionCopy_Seed_triggered();
+    void on_actionMCEdit_triggered();
+    void on_actionRemove_triggered();
+    void on_actionAdd_triggered();
+    void on_actionCopy_triggered();
+    void on_actionRename_triggered();
+    void on_actionRefresh_triggered();
+    void on_actionView_Folder_triggered();
+    void worldChanged(const QModelIndex &current, const QModelIndex &previous);
+    void mceditState(LoggedProcess::State state);
+
+    void ShowContextMenu(const QPoint &pos);
 };