Changeset View
Changeset View
Standalone View
Standalone View
shell/shellutils.cpp
Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Line(s) | 39 | { | |||
---|---|---|---|---|---|
61 | } | 61 | } | ||
62 | return url; | 62 | return url; | ||
63 | } | 63 | } | ||
64 | 64 | | |||
65 | QString serializeOptions(const QCommandLineParser &args) | 65 | QString serializeOptions(const QCommandLineParser &args) | ||
66 | { | 66 | { | ||
67 | const bool startInPresentation = args.isSet( QStringLiteral("presentation") ); | 67 | const bool startInPresentation = args.isSet( QStringLiteral("presentation") ); | ||
68 | const bool showPrintDialog = args.isSet( QStringLiteral("print") ); | 68 | const bool showPrintDialog = args.isSet( QStringLiteral("print") ); | ||
69 | const bool showPrintDialogAndExit = args.isSet( QStringLiteral("print_and_exit") ); | ||||
69 | const bool unique = args.isSet(QStringLiteral("unique")) && args.positionalArguments().count() <= 1; | 70 | const bool unique = args.isSet(QStringLiteral("unique")) && args.positionalArguments().count() <= 1; | ||
70 | const bool noRaise = args.isSet(QStringLiteral("noraise")); | 71 | const bool noRaise = args.isSet(QStringLiteral("noraise")); | ||
71 | const QString page = args.value(QStringLiteral("page")); | 72 | const QString page = args.value(QStringLiteral("page")); | ||
72 | 73 | | |||
73 | return serializeOptions(startInPresentation, showPrintDialog, unique, noRaise, page); | 74 | return serializeOptions(startInPresentation, showPrintDialog, showPrintDialogAndExit, unique, noRaise, page); | ||
74 | } | 75 | } | ||
75 | 76 | | |||
76 | QString serializeOptions(bool startInPresentation, bool showPrintDialog, bool unique, bool noRaise, const QString &page) | 77 | QString serializeOptions(bool startInPresentation, bool showPrintDialog, bool showPrintDialogAndExit, bool unique, bool noRaise, const QString &page) | ||
77 | { | 78 | { | ||
78 | return QStringLiteral("%1:%2:%3:%4:%5").arg(startInPresentation).arg(showPrintDialog).arg(unique).arg(noRaise).arg(page); | 79 | return QStringLiteral("%1:%2:%3:%4:%5:%6").arg(startInPresentation).arg(showPrintDialog).arg(showPrintDialogAndExit).arg(unique).arg(noRaise).arg(page); | ||
79 | } | 80 | } | ||
80 | 81 | | |||
81 | bool unserializeOptions(const QString &serializedOptions, bool *presentation, bool *print, bool *unique, bool *noraise, QString *page) | 82 | bool unserializeOptions(const QString &serializedOptions, bool *presentation, bool *print, bool *print_and_exit, bool *unique, bool *noraise, QString *page) | ||
82 | { | 83 | { | ||
83 | const QStringList args = serializedOptions.split(QStringLiteral(":")); | 84 | const QStringList args = serializedOptions.split(QStringLiteral(":")); | ||
84 | if (args.count() == 5) | 85 | if (args.count() == 6) | ||
85 | { | 86 | { | ||
86 | *presentation = args[0] == QLatin1String("1"); | 87 | *presentation = args[0] == QLatin1String("1"); | ||
87 | *print = args[1] == QLatin1String("1"); | 88 | *print = args[1] == QLatin1String("1"); | ||
88 | *unique = args[2] == QLatin1String("1"); | 89 | *print_and_exit = args[2] == QLatin1String("1"); | ||
89 | *noraise = args[3] == QLatin1String("1"); | 90 | *unique = args[3] == QLatin1String("1"); | ||
90 | *page = args[4]; | 91 | *noraise = args[4] == QLatin1String("1"); | ||
92 | *page = args[5]; | ||||
91 | return true; | 93 | return true; | ||
92 | } | 94 | } | ||
93 | return false; | 95 | return false; | ||
94 | } | 96 | } | ||
95 | 97 | | |||
96 | bool startInPresentation(const QString &serializedOptions) | 98 | bool startInPresentation(const QString &serializedOptions) | ||
97 | { | 99 | { | ||
98 | bool result, dummy; | 100 | bool result, dummy; | ||
99 | QString dummyString; | 101 | QString dummyString; | ||
100 | return unserializeOptions(serializedOptions, &result, &dummy, &dummy, &dummy, &dummyString) && result; | 102 | return unserializeOptions(serializedOptions, &result, &dummy, &dummy, &dummy, &dummy, &dummyString) && result; | ||
101 | } | 103 | } | ||
102 | 104 | | |||
103 | bool showPrintDialog(const QString &serializedOptions) | 105 | bool showPrintDialog(const QString &serializedOptions) | ||
104 | { | 106 | { | ||
105 | bool result, dummy; | 107 | bool result, dummy; | ||
106 | QString dummyString; | 108 | QString dummyString; | ||
107 | return unserializeOptions(serializedOptions, &dummy, &result, &dummy, &dummy, &dummyString) && result; | 109 | return unserializeOptions(serializedOptions, &dummy, &result, &dummy, &dummy, &dummy, &dummyString) && result; | ||
110 | } | ||||
111 | | ||||
112 | bool showPrintDialogAndExit(const QString &serializedOptions) | ||||
113 | { | ||||
114 | bool result, dummy; | ||||
115 | QString dummyString; | ||||
116 | return unserializeOptions(serializedOptions, &dummy, &dummy, &result, &dummy, &dummy, &dummyString) && result; | ||||
108 | } | 117 | } | ||
109 | 118 | | |||
110 | bool unique(const QString &serializedOptions) | 119 | bool unique(const QString &serializedOptions) | ||
111 | { | 120 | { | ||
112 | bool result, dummy; | 121 | bool result, dummy; | ||
113 | QString dummyString; | 122 | QString dummyString; | ||
114 | return unserializeOptions(serializedOptions, &dummy, &dummy, &result, &dummy, &dummyString) && result; | 123 | return unserializeOptions(serializedOptions, &dummy, &dummy, &dummy, &result, &dummy, &dummyString) && result; | ||
115 | } | 124 | } | ||
116 | 125 | | |||
117 | bool noRaise(const QString &serializedOptions) | 126 | bool noRaise(const QString &serializedOptions) | ||
118 | { | 127 | { | ||
119 | bool result, dummy; | 128 | bool result, dummy; | ||
120 | QString dummyString; | 129 | QString dummyString; | ||
121 | return unserializeOptions(serializedOptions, &dummy, &dummy, &dummy, &result, &dummyString) && result; | 130 | return unserializeOptions(serializedOptions, &dummy, &dummy, &dummy, &dummy, &result, &dummyString) && result; | ||
122 | } | 131 | } | ||
123 | 132 | | |||
124 | QString page(const QString &serializedOptions) | 133 | QString page(const QString &serializedOptions) | ||
125 | { | 134 | { | ||
126 | QString result; | 135 | QString result; | ||
127 | bool dummy; | 136 | bool dummy; | ||
128 | unserializeOptions(serializedOptions, &dummy, &dummy, &dummy, &dummy, &result); | 137 | unserializeOptions(serializedOptions, &dummy, &dummy, &dummy, &dummy, &dummy, &result); | ||
129 | return result; | 138 | return result; | ||
130 | } | 139 | } | ||
131 | 140 | | |||
132 | } | 141 | } |