From 2a5a3078faca6461b8723da58d27c3bec2ff671c Mon Sep 17 00:00:00 2001 From: konrad Date: Sat, 19 Feb 2011 20:49:33 +0000 Subject: [PATCH] set all menu bars to non-native git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@729 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33 --- src/dialogs/configdialog.cpp | 1 + src/dialogs/login.cpp | 1 + src/dialogs/orderwin.cpp | 1 + src/mwin/aclwin.cpp | 1 + src/mwin/carttab.cpp | 1 + src/mwin/entrancetab.cpp | 1 + src/mwin/eventstab.cpp | 1 + src/mwin/overview.cpp | 1 + src/mwin/tabwin.cpp | 2 ++ src/templates/ticketedit.cpp | 1 + 10 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/dialogs/configdialog.cpp b/src/dialogs/configdialog.cpp index 2b54711..4c60af5 100644 --- a/src/dialogs/configdialog.cpp +++ b/src/dialogs/configdialog.cpp @@ -57,6 +57,7 @@ MConfigDialog::MConfigDialog() //create Menu Bar QMenuBar*mb; hl->setMenuBar(mb=new QMenuBar); + mb->setNativeMenuBar(false); QMenu*m=mb->addMenu(tr("&Profile")); m->addAction(tr("&New Profile..."),this,SLOT(newProfile())); m->addAction(tr("&Delete Profile"),this,SLOT(deleteProfile())); diff --git a/src/dialogs/login.cpp b/src/dialogs/login.cpp index f389c51..c31e5b8 100644 --- a/src/dialogs/login.cpp +++ b/src/dialogs/login.cpp @@ -39,6 +39,7 @@ MLogin::MLogin() //create Menu Bar QMenuBar*mb; vl->setMenuBar(mb=new QMenuBar); + mb->setNativeMenuBar(false); QMenu*m=mb->addMenu(tr("&File")); m->addAction(tr("&Exit"),this,SLOT(close())); m=mb->addMenu(tr("&Configure")); diff --git a/src/dialogs/orderwin.cpp b/src/dialogs/orderwin.cpp index c71f9d9..64fc160 100644 --- a/src/dialogs/orderwin.cpp +++ b/src/dialogs/orderwin.cpp @@ -86,6 +86,7 @@ MOrderWindow::MOrderWindow(QWidget*par,const MOOrder&o) m_changed=false; QMenuBar*mb=menuBar(); + mb->setNativeMenuBar(false); QMenu *m=mb->addMenu(tr("&Order")); m_res2order=m->addAction(tr("&Order..."),this,SLOT(createOrder())); m_cancel=m->addAction(tr("C&ancel Order..."),this,SLOT(cancelOrder())); diff --git a/src/mwin/aclwin.cpp b/src/mwin/aclwin.cpp index af15d0b..f3fe337 100644 --- a/src/mwin/aclwin.cpp +++ b/src/mwin/aclwin.cpp @@ -52,6 +52,7 @@ MAclWindow::MAclWindow(QWidget*par) //menu QMenuBar*mb=menuBar(); + mb->setNativeMenuBar(false); QMenu*m=mb->addMenu(tr("&Window")); m->addAction(tr("&Close"),this,SLOT(close())); diff --git a/src/mwin/carttab.cpp b/src/mwin/carttab.cpp index da74017..943d412 100644 --- a/src/mwin/carttab.cpp +++ b/src/mwin/carttab.cpp @@ -137,6 +137,7 @@ MCartTab::MCartTab(QString pk) QMenuBar*MCartTab::menu() { QMenuBar*mb=new QMenuBar; + mb->setNativeMenuBar(false); QMenu*m=mb->addMenu(tr("Ca&rt")); m->addAction(tr("Add &Ticket"),this,SLOT(cartAddTicket())); m->addAction(tr("Add &Voucher"),this,SLOT(cartAddVoucher())); diff --git a/src/mwin/entrancetab.cpp b/src/mwin/entrancetab.cpp index c56909f..1421928 100644 --- a/src/mwin/entrancetab.cpp +++ b/src/mwin/entrancetab.cpp @@ -88,6 +88,7 @@ MEntranceTab::MEntranceTab(QString pk) QMenuBar* MEntranceTab::menu() const { QMenuBar *mb=new QMenuBar; + mb->setNativeMenuBar(false); QMenu*m=mb->addMenu("&Entrance"); m->addAction("&Configure...",this,SLOT(configure())); m->addAction("&Recheck events",this,SLOT(initialize())); diff --git a/src/mwin/eventstab.cpp b/src/mwin/eventstab.cpp index 2c747f2..e6e9b7b 100644 --- a/src/mwin/eventstab.cpp +++ b/src/mwin/eventstab.cpp @@ -87,6 +87,7 @@ QMenuBar*MEventsTab::menu() { //menu QMenuBar*mb=new QMenuBar; + mb->setNativeMenuBar(false); QMenu*m=mb->addMenu(tr("&Event")); m->addAction(tr("&Update Event List"),this,SLOT(updateEvents())) ->setEnabled(req->hasRight(req->RGetAllEvents)); diff --git a/src/mwin/overview.cpp b/src/mwin/overview.cpp index 971807f..d6b4531 100644 --- a/src/mwin/overview.cpp +++ b/src/mwin/overview.cpp @@ -74,6 +74,7 @@ MOverview::MOverview(QString pk) //menu QMenuBar*mb=menuBar(); + mb->setNativeMenuBar(false); QMenu*m=mb->addMenu(tr("&Session")); m->addAction(tr("&Re-Login"),this,SLOT(relogin())); m->addAction(tr("Change my &Password"),this,SLOT(setMyPassword())) diff --git a/src/mwin/tabwin.cpp b/src/mwin/tabwin.cpp index 64c72ea..fb92e41 100644 --- a/src/mwin/tabwin.cpp +++ b/src/mwin/tabwin.cpp @@ -69,6 +69,7 @@ MTabWin::MTabWin(QString pk,QWidget*parent) hl->setMargin(0); hl->setContentsMargins(0,0,0,0); hl->addWidget(leftmenu=new QMenuBar,0); + leftmenu->setNativeMenuBar(false); QFrame*frm; hl->addWidget(frm=new QFrame,0); frm->setFrameStyle(QFrame::VLine|QFrame::Sunken); @@ -77,6 +78,7 @@ MTabWin::MTabWin(QString pk,QWidget*parent) hl->addWidget(frm=new QFrame,0); frm->setFrameStyle(QFrame::VLine|QFrame::Sunken); hl->addWidget(rightmenu=new QMenuBar,0); + rightmenu->setNativeMenuBar(false); rightmenu->addMenu(helpmenu=MApplication::helpMenu()); diff --git a/src/templates/ticketedit.cpp b/src/templates/ticketedit.cpp index bb655f3..eacee75 100644 --- a/src/templates/ticketedit.cpp +++ b/src/templates/ticketedit.cpp @@ -164,6 +164,7 @@ MTicketEditor::MTicketEditor(QWidget* parent, Qt::WindowFlags f): QMainWindow(pa { //menu QMenuBar*mb=menuBar(); + mb->setNativeMenuBar(false); QMenu*m=mb->addMenu(tr("&File")); m->addAction(tr("&Open File..."),this,SLOT(openFile())) ->setShortcut(QKeySequence(Qt::Key_Control|Qt::Key_O)); -- 1.7.2.5