Skip to content
Snippets Groups Projects
Commit 35bb9cf9 authored by Kurt Hindenburg's avatar Kurt Hindenburg
Browse files

Remove the the immature --background-mode option

See http://lists.kde.org/?l=konsole-devel&m=135316608321148&w=2 for
details.

FIXED-IN: 4.11
BUG: 310433
parent 3cd4d2e4
No related branches found
No related tags found
No related merge requests found
......@@ -46,8 +46,6 @@ Application::Application() : KUniqueApplication()
void Application::init()
{
_backgroundInstance = 0;
#if defined(Q_WS_MAC)
// this ensures that Ctrl and Meta are not swapped, so CTRL-C and friends
// will work correctly in the terminal
......@@ -127,28 +125,22 @@ int Application::newInstance()
}
}
// if the background-mode argument is supplied, start the background
// session ( or bring to the front if it already exists )
if (args->isSet("background-mode")) {
startBackgroundMode(window);
} else {
// Qt constrains top-level windows which have not been manually
// resized (via QWidget::resize()) to a maximum of 2/3rds of the
// screen size.
//
// This means that the terminal display might not get the width/
// height it asks for. To work around this, the widget must be
// manually resized to its sizeHint().
//
// This problem only affects the first time the application is run.
// run. After that KMainWindow will have manually resized the
// window to its saved size at this point (so the Qt::WA_Resized
// attribute will be set)
if (!window->testAttribute(Qt::WA_Resized))
window->resize(window->sizeHint());
window->show();
}
// Qt constrains top-level windows which have not been manually
// resized (via QWidget::resize()) to a maximum of 2/3rds of the
// screen size.
//
// This means that the terminal display might not get the width/
// height it asks for. To work around this, the widget must be
// manually resized to its sizeHint().
//
// This problem only affects the first time the application is run.
// run. After that KMainWindow will have manually resized the
// window to its saved size at this point (so the Qt::WA_Resized
// attribute will be set)
if (!window->testAttribute(Qt::WA_Resized))
window->resize(window->sizeHint());
window->show();
}
firstInstance = false;
......@@ -429,37 +421,5 @@ Profile::Ptr Application::processProfileChangeArgs(KCmdLineArgs* args, Profile::
}
}
void Application::startBackgroundMode(MainWindow* window)
{
if (_backgroundInstance) {
return;
}
KAction* action = window->actionCollection()->addAction("toggle-background-window");
action->setObjectName(QLatin1String("Konsole Background Mode"));
action->setText(i18n("Toggle Background Window"));
action->setGlobalShortcut(KShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_F12)));
connect(action, SIGNAL(triggered()),
this, SLOT(toggleBackgroundInstance()));
_backgroundInstance = window;
}
void Application::toggleBackgroundInstance()
{
Q_ASSERT(_backgroundInstance);
if (!_backgroundInstance->isVisible()) {
_backgroundInstance->show();
// ensure that the active terminal display has the focus. Without
// this, an odd problem occurred where the focus widget would change
// each time the background instance was shown
_backgroundInstance->setFocus();
} else {
_backgroundInstance->hide();
}
}
#include "Application.moc"
......@@ -69,13 +69,10 @@ private slots:
void createWindow(Profile::Ptr profile , const QString& directory);
void detachView(Session* session);
void toggleBackgroundInstance();
private:
void init();
void listAvailableProfiles();
void listProfilePropertyInfo();
void startBackgroundMode(MainWindow* window);
bool processHelpArgs(KCmdLineArgs* args);
MainWindow* processWindowArgs(KCmdLineArgs* args);
Profile::Ptr processProfileSelectArgs(KCmdLineArgs* args);
......@@ -84,7 +81,6 @@ private:
void createTabFromArgs(KCmdLineArgs* args, MainWindow* window,
const QHash<QString, QString>&);
MainWindow* _backgroundInstance;
};
}
#endif // APPLICATION_H
......@@ -168,9 +168,6 @@ void fillCommandLineOptions(KCmdLineOptions& options)
options.add("tabs-from-file <file>",
ki18nc("@info:shell", "Create tabs as specified in given tabs configuration"
" file"));
options.add("background-mode",
ki18nc("@info:shell", "Start Konsole in the background and bring to the front"
" when Ctrl+Shift+F12 (by default) is pressed"));
options.add("show-menubar", ki18nc("@info:shell", "Show the menubar, overriding the default setting"));
options.add("hide-menubar", ki18nc("@info:shell", "Hide the menubar, overriding the default setting"));
options.add("show-tabbar", ki18nc("@info:shell", "Show the tabbar, overriding the default setting"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment