zeit: move toggleItem action, some minor changes

This commit is contained in:
blaze 2021-04-20 21:17:12 +03:00
parent a815310fc7
commit 0f4b03c35a
No known key found for this signature in database
GPG Key ID: C4996C546950EAE4
3 changed files with 22 additions and 16 deletions

View File

@ -1,5 +1,5 @@
/* ========================================================================
* Copyright (C) 2015-2020 Blaze <blaze@vivaldi.net>
* Copyright (C) 2015-2021 Blaze <blaze@vivaldi.net>
*
* This file is part of Zeit.
*
@ -95,10 +95,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent),
ui->actionTasks->setActionGroup(group);
ui->actionVariables->setActionGroup(group);
ui->actionCommands->setActionGroup(group);
toggleItemAction = new QAction(this);
toggleItemAction->setText(tr("To&ggle"));
toggleItemAction->setShortcut(QStringLiteral("Ctrl+G"));
connect(toggleItemAction, &QAction::triggered, this, [this] {
connect(ui->toggleItemAction, &QAction::triggered, this, [this] {
int index = ui->listWidget->currentRow();
if(ui->actionTasks->isChecked()) {
CTTask* task = cron->tasks().at(index);
@ -113,17 +110,16 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent),
setIcon(ui->listWidget->item(index), var->enabled);
}
});
ui->listWidget->addAction(toggleItemAction);
ui->listWidget->addAction(ui->toggleItemAction);
ui->listWidget->addAction(ui->actionModifyEntry);
ui->listWidget->addAction(ui->actionDeleteEntry);
ui->listWidget->setContextMenuPolicy(Qt::ActionsContextMenu);
ui->listWidget->setWordWrap(ui->actionWrapText->isChecked());
connect(ui->listWidget, &QListWidget::itemSelectionChanged, this, [this] {
refreshActions(ui->listWidget->currentRow() > -1
&& ui->listWidget->currentItem()->isSelected());
});
connect(ui->listWidget, &QListWidget::itemDoubleClicked,
toggleItemAction, &QAction::trigger);
ui->toggleItemAction, &QAction::trigger);
connect(ui->hideFilterButton, &QPushButton::released,
ui->actionShowFilter, &QAction::toggle);
connect(ui->filterEdit, &QLineEdit::textEdited,
@ -196,7 +192,7 @@ void MainWindow::keyPressEvent(QKeyEvent* e) {
}
void MainWindow::refreshActions(bool enabled) {
toggleItemAction->setDisabled(ui->actionCommands->isChecked() || !enabled);
ui->toggleItemAction->setDisabled(ui->actionCommands->isChecked() || !enabled);
bool currentUser = cron->isCurrentUserCron() || cron->isSystemCron();
ui->actionAddEntry->setEnabled(currentUser);
ui->actionModifyEntry->setEnabled((currentUser && enabled)
@ -217,11 +213,11 @@ void MainWindow::showTasks() {
ui->listWidget->clear();
for(CTTask* task: cron->tasks()) {
QListWidgetItem* item = new QListWidgetItem();
QString text;
text.append(tr("Command: %1\n"
"Description: %2\n").arg(task->command, task->comment));
text.append(tr("Runs %1",
"Runs at 'period described'").arg(task->describe()));
QString text(tr("Description: %1\n"
"Runs %2\n"
"Command: %3",
"Runs at 'period described'")
.arg(task->comment, task->describe(), task->command));
item->setText(text);
setIcon(item, task->enabled);
ui->listWidget->addItem(item);

View File

@ -41,7 +41,6 @@ class MainWindow : public QMainWindow
CTCron* cron;
Ui::MainWindow *ui;
Commands* commands;
QAction* toggleItemAction;
void keyPressEvent(QKeyEvent*);
void refreshActions(bool);
void setIcon(QListWidgetItem* item, bool enabled);

View File

@ -76,7 +76,7 @@
<x>0</x>
<y>0</y>
<width>787</width>
<height>28</height>
<height>27</height>
</rect>
</property>
<widget class="QMenu" name="menuAdd">
@ -276,6 +276,17 @@
<string notr="true">Ctrl+W</string>
</property>
</action>
<action name="toggleItemAction">
<property name="text">
<string>To&amp;ggle</string>
</property>
<property name="toolTip">
<string>Toggle Item</string>
</property>
<property name="shortcut">
<string>Ctrl+G</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>