Skip to content

Commit 65216e9

Browse files
committed
Revert "ShowBootLog: Add --output=verbose option"
This reverts commit 7d8047e. The previously merged --verbose mode interferes (and breaks) qjournalctl's filtering functionality.
1 parent 7d8047e commit 65216e9

File tree

3 files changed

+1
-24
lines changed

3 files changed

+1
-24
lines changed

src/showbootlog.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,6 @@ void ShowBootLog::updateBootLog(bool keepIdentifiers)
149149
untilStr = " --until \"" + ui->untilDateTimeEdit->dateTime().toString("yyyy-MM-dd hh:mm:00") + "\"";
150150
}
151151

152-
QString verbose = "";
153-
if(verboseflag)
154-
verbose=" --output=verbose -x ";
155152

156153
QString command = "";
157154
if(this->completeJournal){
@@ -164,8 +161,6 @@ void ShowBootLog::updateBootLog(bool keepIdentifiers)
164161
}
165162
}
166163

167-
command += verbose;
168-
169164
if(this->reverse){
170165
command = command + " -r";
171166
}
@@ -417,11 +412,3 @@ void ShowBootLog::on_exportSelectionButton_clicked()
417412
writeToExportFile(fileName, selection.toLocal8Bit().data());
418413
}
419414

420-
421-
422-
void ShowBootLog::on_verboseCheckBox_stateChanged(int arg1)
423-
{
424-
verboseflag = arg1;
425-
updateBootLog(false);
426-
}
427-

src/showbootlog.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ private slots:
6666

6767
void on_horizontalSlider_valueChanged(int value);
6868

69-
void on_verboseCheckBox_stateChanged(int arg1);
70-
7169
private:
7270
void updateBootLog(bool keepIdentifiers=false);
7371

@@ -77,7 +75,6 @@ private slots:
7775
// Only journalctl options
7876
QString bootid;
7977
bool sinceFlag=false, untilFlag=false;
80-
bool verboseflag=false;
8178
bool completeJournal=false;
8279
bool realtime=false;
8380
bool reverse=false;

ui/showbootlog.ui

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<x>0</x>
1111
<y>0</y>
1212
<width>1164</width>
13-
<height>675</height>
13+
<height>632</height>
1414
</rect>
1515
</property>
1616
<property name="windowTitle">
@@ -207,13 +207,6 @@
207207
</item>
208208
</layout>
209209
</item>
210-
<item>
211-
<widget class="QCheckBox" name="verboseCheckBox">
212-
<property name="text">
213-
<string>Verbose</string>
214-
</property>
215-
</widget>
216-
</item>
217210
<item>
218211
<widget class="QLabel" name="label_12">
219212
<property name="font">

0 commit comments

Comments
 (0)