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

make sure not to show our own status bar if we're a kpart 

init m_ActionCollection first so isKPart() is guaranteed to work as early as
possible

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1093899
This commit is contained in:
Volker Lanz 2010-02-21 17:54:52 +00:00
parent 4d036f7783
commit 5d278d64b8
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/mainwindow.cpp
View File

@ -46,9 +46,9 @@
MainWindow::MainWindow(QWidget* parent, KActionCollection* coll) :
KXmlGuiWindow(parent),
Ui::MainWindowBase(),
m_ActionCollection(coll),
m_StatusText(new QLabel(this)),
m_InfoPane(new InfoPane(this)),
m_ActionCollection(coll)
m_InfoPane(new InfoPane(this))
{
setupUi(this);
init();
@ -69,7 +69,10 @@ void MainWindow::init()
pmWidget().init(actionCollection(), "partitionmanagerrc");
if (isKPart())
setupGUI(ToolBar | Keys | StatusBar | Save);
{
setupGUI(ToolBar | Keys | Save);
statusBar()->hide();
}
else
setupGUI(ToolBar | Keys | StatusBar | Save | Create);
@ -152,7 +155,8 @@ void MainWindow::setupConnections()
void MainWindow::setupStatusBar()
{
statusBar()->addWidget(&statusText());
if (!isKPart())
statusBar()->addWidget(&statusText());
}
void MainWindow::loadConfig()
@ -175,7 +179,8 @@ void MainWindow::on_m_PartitionManagerWidget_operationsChanged()
{
listOperations().updateOperations(pmWidget().operations());
statusText().setText(i18ncp("@info:status", "One pending operation", "%1 pending operations", pmWidget().numPendingOperations()));
if (!isKPart())
statusText().setText(i18ncp("@info:status", "One pending operation", "%1 pending operations", pmWidget().numPendingOperations()));
}
void MainWindow::on_m_PartitionManagerWidget_devicesChanged()

2
src/gui/mainwindow.h
View File

@ -101,9 +101,9 @@ class LIBPARTITIONMANAGERPRIVATE_EXPORT MainWindow : public KXmlGuiWindow, publi
void onShowMenuBar();
private:
KActionCollection* m_ActionCollection;
QLabel* m_StatusText;
InfoPane* m_InfoPane;
KActionCollection* m_ActionCollection;
};
#endif

2
src/kpart/partitionmanagerpart.rc
View File

@ -68,7 +68,5 @@
</Menu>
</MenuBar>
<StatusBar/>
</kpartgui>