andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Port away from KMenu.

This commit is contained in:
Andrius Štikonas 2014-05-17 03:20:43 +01:00
parent 81ce940171
commit d1ae9dc4a7
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/mainwindow.cpp
View File

@ -61,7 +61,6 @@
#include <kstandardguiitem.h> #include <kstandardguiitem.h>
#include <kaction.h> #include <kaction.h>
#include <kapplication.h> #include <kapplication.h>
#include <kmenu.h>
#include <KLocalizedString> #include <KLocalizedString>
#include <kxmlguifactory.h> #include <kxmlguifactory.h>
#include <kfiledialog.h> #include <kfiledialog.h>
@ -75,6 +74,7 @@
#include <QPointer> #include <QPointer>
#include <QFile> #include <QFile>
#include <QDateTime> #include <QDateTime>
#include <QMenu>
#include <QTextStream> #include <QTextStream>
#include <config.h> #include <config.h>
@ -482,7 +482,7 @@ void MainWindow::updateWindowTitle()
void MainWindow::on_m_ListOperations_contextMenuRequested(const QPoint& pos) void MainWindow::on_m_ListOperations_contextMenuRequested(const QPoint& pos)
{ {
KMenu* menu = static_cast<KMenu*>(guiFactory()->container("edit", this)); QMenu* menu = static_cast<QMenu*>(guiFactory()->container("edit", this));
if (menu) if (menu)
menu->exec(pos); menu->exec(pos);
@ -490,7 +490,7 @@ void MainWindow::on_m_ListOperations_contextMenuRequested(const QPoint& pos)
void MainWindow::on_m_TreeLog_contextMenuRequested(const QPoint& pos) void MainWindow::on_m_TreeLog_contextMenuRequested(const QPoint& pos)
{ {
KMenu* menu = static_cast<KMenu*>(guiFactory()->container("log", this)); QMenu* menu = static_cast<QMenu*>(guiFactory()->container("log", this));
if (menu) if (menu)
menu->exec(pos); menu->exec(pos);
@ -498,7 +498,7 @@ void MainWindow::on_m_TreeLog_contextMenuRequested(const QPoint& pos)
void MainWindow::on_m_ListDevices_contextMenuRequested(const QPoint& pos) void MainWindow::on_m_ListDevices_contextMenuRequested(const QPoint& pos)
{ {
KMenu* menu = static_cast<KMenu*>(guiFactory()->container("device", this)); QMenu* menu = static_cast<QMenu*>(guiFactory()->container("device", this));
if (menu) if (menu)
menu->exec(pos); menu->exec(pos);
@ -506,15 +506,15 @@ void MainWindow::on_m_ListDevices_contextMenuRequested(const QPoint& pos)
void MainWindow::on_m_PartitionManagerWidget_contextMenuRequested(const QPoint& pos) void MainWindow::on_m_PartitionManagerWidget_contextMenuRequested(const QPoint& pos)
{ {
KMenu* menu = NULL; QMenu* menu = NULL;
if (pmWidget().selectedPartition() == NULL) if (pmWidget().selectedPartition() == NULL)
{ {
if (pmWidget().selectedDevice() != NULL) if (pmWidget().selectedDevice() != NULL)
menu = static_cast<KMenu*>(guiFactory()->container("device", this)); menu = static_cast<QMenu*>(guiFactory()->container("device", this));
} }
else else
menu = static_cast<KMenu*>(guiFactory()->container("partition", this)); menu = static_cast<QMenu*>(guiFactory()->container("partition", this));
if (menu) if (menu)
menu->exec(pos); menu->exec(pos);
@ -595,7 +595,7 @@ void MainWindow::on_m_DeviceScanner_finished()
void MainWindow::updateSeletedDeviceMenu() void MainWindow::updateSeletedDeviceMenu()
{ {
KMenu* devicesMenu = static_cast<KMenu*>(guiFactory()->container("selectedDevice", this)); QMenu* devicesMenu = static_cast<QMenu*>(guiFactory()->container("selectedDevice", this));
devicesMenu->clear(); devicesMenu->clear();
devicesMenu->setEnabled(!operationStack().previewDevices().isEmpty()); devicesMenu->setEnabled(!operationStack().previewDevices().isEmpty());
@ -614,7 +614,7 @@ void MainWindow::updateSeletedDeviceMenu()
void MainWindow::onSelectedDeviceMenuTriggered(bool) void MainWindow::onSelectedDeviceMenuTriggered(bool)
{ {
QAction* action = qobject_cast<QAction*>(sender()); QAction* action = qobject_cast<QAction*>(sender());
KMenu* devicesMenu = static_cast<KMenu*>(guiFactory()->container("selectedDevice", this)); QMenu* devicesMenu = static_cast<QMenu*>(guiFactory()->container("selectedDevice", this));
if (action == NULL || action->parent() != devicesMenu) if (action == NULL || action->parent() != devicesMenu)
return; return;
@ -627,7 +627,7 @@ void MainWindow::onSelectedDeviceMenuTriggered(bool)
void MainWindow::on_m_ListDevices_selectionChanged(const QString& device_node) void MainWindow::on_m_ListDevices_selectionChanged(const QString& device_node)
{ {
KMenu* devicesMenu = static_cast<KMenu*>(guiFactory()->container("selectedDevice", this)); QMenu* devicesMenu = static_cast<QMenu*>(guiFactory()->container("selectedDevice", this));
foreach (QAction* entry, qFindChildren<QAction*>(devicesMenu)) foreach (QAction* entry, qFindChildren<QAction*>(devicesMenu))
entry->setChecked(entry->data().toString() == device_node); entry->setChecked(entry->data().toString() == device_node);

6
src/util/helpers.cpp
View File

@ -31,7 +31,6 @@
#include <kcomponentdata.h> #include <kcomponentdata.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kmenu.h>
#include <kstringhandler.h> #include <kstringhandler.h>
#include <solid/device.h> #include <solid/device.h>
@ -39,6 +38,7 @@
#include <QProcess> #include <QProcess>
#include <QFileInfo> #include <QFileInfo>
#include <QApplication> #include <QApplication>
#include <QMenu>
#include <QPainter> #include <QPainter>
#include <QIcon> #include <QIcon>
#include <QPixmap> #include <QPixmap>
@ -159,9 +159,7 @@ QIcon createFileSystemColor(FileSystem::Type type, quint32 size)
void showColumnsContextMenu(const QPoint& p, QTreeWidget& tree) void showColumnsContextMenu(const QPoint& p, QTreeWidget& tree)
{ {
KMenu headerMenu; QMenu headerMenu(i18nc("@title:menu", "Columns"));
headerMenu.addTitle(i18nc("@title:menu", "Columns"));
QHeaderView* header = tree.header(); QHeaderView* header = tree.header();