summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2018-03-24 16:00:14 (GMT)
committerKevin Smith <git@kismith.co.uk>2018-03-24 16:00:14 (GMT)
commitd0fa44684ef84decb9cf567e4ebdf682e7a283f9 (patch)
tree54c82785787fe42e0df1b4b0bf04a1ad7a59cb9b /Swift
parent512ead31d3df492d315ad7257536a3c15bddcf2d (diff)
downloadswift-d0fa44684ef84decb9cf567e4ebdf682e7a283f9.zip
swift-d0fa44684ef84decb9cf567e4ebdf682e7a283f9.tar.bz2
Always use netbook mode
Thus begins 5.0's UI reworking. This removes the option for netbook mode, leaving it always-on. Test-Information: Ran with no parameters on macOS, resized the window, quit, restarted, size seemed to have persisted. Logged in, menus seem to work (debug console at least). Sign out, log in again was fine. Change-Id: I365eb6ada33994b75636675576a1443f9b385593
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/QtSwift.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 7daa5ce..28793fa 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -92,12 +92,11 @@ po::options_description QtSwift::getOptionsDescription() {
("debug", "Turn on debug logging")
("help", "Show this help message")
("version", "Show version information")
- ("netbook-mode", "Use netbook mode display (unsupported)")
("no-tabs", "Don't manage chat windows in tabs (unsupported)")
("latency-debug", "Use latency debugging (unsupported)")
("multi-account", po::value<int>()->default_value(1), "Number of accounts to open windows for (unsupported)")
("start-minimized", "Don't show the login/roster window at startup")
- ("enable-jid-adhocs", "Enable AdHoc commands to custom JID's.")
+ ("enable-jid-adhocs", "Enable AdHoc commands to custom JIDs.")
#if QT_VERSION >= 0x040800
("language", po::value<std::string>(), "Use a specific language, instead of the system-wide one")
#endif
@@ -172,11 +171,7 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
loadEmoticonsFile(":/emoticons/emoticons.txt", emoticons);
loadEmoticonsFile(P2QSTRING(pathToString(Paths::getExecutablePath() / "emoticons.txt")), emoticons);
- if (options.count("netbook-mode")) {
- splitter_ = new QtSingleWindow(qtSettings_);
- } else {
- splitter_ = nullptr;
- }
+ splitter_ = new QtSingleWindow(qtSettings_);
int numberOfAccounts = 1;
try {