From 29bee6b5289028aeee68dad953e9afab7b9244b5 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 16 Aug 2014 00:11:17 +0900 Subject: [PATCH] Patched "TQPopupMenu: (unnamed) Popup has invalid menu item" warning message appearance when Basket is started without a basketrc file. This resolves bug 1981." --- src/main.cpp | 2 -- src/mainwindow.cpp | 9 ++++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index dfdb1a6..f5f8441 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -86,8 +86,6 @@ int main(int argc, char *argv[]) MainWindow* win = new MainWindow(); Global::bnpView->handleCommandLine(); app.setMainWidget(win); -// if (!(Settings::useSystray() && TDECmdLineArgs::parsedArgs() && TDECmdLineArgs::parsedArgs()->isSet("start-hidden"))) -// win->show(); if (Settings::useSystray()) { // The user wanted to not show the window (but it is already hidden by default, so we do nothing): diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1331ce0..09a3e5d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -107,14 +107,17 @@ MainWindow::MainWindow(TQWidget *parent, const char *name) m_baskets = new BNPView(this, "BNPViewApp", this, actionCollection(), bar); setCentralWidget(m_baskets); + // Do not remove. This call to 'resize' prevents the appearance of annoying + // warning messages if basket is started without a basketrc config file + resize(450, 360); + setupActions(); statusBar()->show(); statusBar()->setSizeGripEnabled(true); - setAutoSaveSettings(/*groupName=*/TQString::fromLatin1("MainWindow"), /*saveWindowSize=*//*FIXME:false:Why was it false??*/true); + setAutoSaveSettings(/*groupName=*/TQString::fromLatin1("MainWindow"),true); -// m_actShowToolbar->setChecked( toolBar()->isShown() ); - m_actShowStatusbar->setChecked( statusBar()->isShown() ); + m_actShowStatusbar->setChecked( statusBar()->isShown() ); connect( m_baskets, TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(setCaption(const TQString &))); // InlineEditors::instance()->richTextToolBar();