diff --git a/component/kylintitlebar.cpp b/component/kylintitlebar.cpp index 147ae5e..e2f41bf 100644 --- a/component/kylintitlebar.cpp +++ b/component/kylintitlebar.cpp @@ -105,11 +105,11 @@ void KylinTitleBar::setTitleWidth(int width) { title_width = width; -#ifdef __aarch64__ +//#ifdef __aarch64__ close_btn->move(title_width - 36, 0); -#else - close_btn->move(0, 0); -#endif +//#else +// close_btn->move(0, 0); +//#endif } void KylinTitleBar::resizeEvent(QResizeEvent *event) diff --git a/plugins/systemmonitor/filesystemworker.cpp b/plugins/systemmonitor/filesystemworker.cpp index ffe24e8..dac1efe 100644 --- a/plugins/systemmonitor/filesystemworker.cpp +++ b/plugins/systemmonitor/filesystemworker.cpp @@ -6,6 +6,7 @@ #include /*For PRIu64*/ #include +//#include typedef struct _DISK_INFO { @@ -78,12 +79,19 @@ DISK_INFO add_disk(const glibtop_mountentry *entry, gboolean show_all_fs) return disk; } +//void hello(gpointer data) +//{ +// g_print ("Hello World\n"); +//} FileSystemWorker::FileSystemWorker(DiskModel *diskList, QObject *parent) : QObject(parent), m_diskModel(diskList) { onFileSystemListChanged(); +// GVolumeMonitor * monitor; +// monitor = g_volume_monitor_get(); +// g_signal_connect(monitor, "mount-added", G_CALLBACK(hello), NULL); } void FileSystemWorker::onFileSystemListChanged() diff --git a/plugins/systemmonitor/mysearchedit.cpp b/plugins/systemmonitor/mysearchedit.cpp index f6ef654..cc62e9f 100644 --- a/plugins/systemmonitor/mysearchedit.cpp +++ b/plugins/systemmonitor/mysearchedit.cpp @@ -50,8 +50,6 @@ MySearchEdit::MySearchEdit(QWidget *parent) connect(m_clearBtn, &MyImageButton::clicked, this, &MySearchEdit::clear); connect(m_edit, &QLineEdit::textChanged, [this] {m_clearBtn->setVisible(!m_edit->text().isEmpty());}); connect(m_edit, &QLineEdit::textChanged, this, &MySearchEdit::textChanged, Qt::DirectConnection); - connect(m_edit, &QLineEdit::editingFinished, this, &MySearchEdit::editingFinished, Qt::DirectConnection); - connect(m_edit, &QLineEdit::returnPressed, this, &MySearchEdit::returnPressed, Qt::DirectConnection); } MySearchEdit::~MySearchEdit() @@ -64,26 +62,26 @@ const QString MySearchEdit::text() const return m_edit->text(); } -void MySearchEdit::mousePressEvent(QMouseEvent *e) +void MySearchEdit::mousePressEvent(QMouseEvent *event) { - if (e->button() != Qt::LeftButton) - return QFrame::mousePressEvent(e); + if (event->button() != Qt::LeftButton) + return QFrame::mousePressEvent(event); - toEditMode(); + setEditFocus(); - e->accept(); + event->accept(); } -void MySearchEdit::mouseReleaseEvent(QMouseEvent *e) +void MySearchEdit::mouseReleaseEvent(QMouseEvent *event) { - e->accept(); + event->accept(); } -bool MySearchEdit::eventFilter(QObject *o, QEvent *e) +bool MySearchEdit::eventFilter(QObject *object, QEvent *event) { - if (o == m_edit && e->type() == QEvent::FocusOut && m_edit->text().isEmpty()) { - auto fe = dynamic_cast(e); - if (fe && fe->reason() != Qt::PopupFocusReason) { + if (object == m_edit && event->type() == QEvent::FocusOut && m_edit->text().isEmpty()) { + auto focusEvent = dynamic_cast(event); + if (focusEvent && focusEvent->reason() != Qt::PopupFocusReason) { m_animation->stop(); m_animation->setStartValue(m_edit->width()); m_animation->setEndValue(0); @@ -92,17 +90,7 @@ bool MySearchEdit::eventFilter(QObject *o, QEvent *e) } } - if (o == m_edit) { - if (e->type() == QEvent::FocusOut) { - emit focusOut(); - } - - if (e->type() == QEvent::FocusIn) { - emit focusIn(); - } - } - - return QFrame::eventFilter(o, e); + return QFrame::eventFilter(object, event); } QLineEdit *MySearchEdit::getLineEdit() const @@ -110,7 +98,7 @@ QLineEdit *MySearchEdit::getLineEdit() const return m_edit; } -void MySearchEdit::toEditMode() +void MySearchEdit::setEditFocus() { m_animation->stop(); m_animation->setStartValue(0); @@ -132,24 +120,24 @@ void MySearchEdit::initInsideFrame() insideLayout->addWidget(m_insideFrame); } -void MySearchEdit::resizeEvent(QResizeEvent *e) +void MySearchEdit::resizeEvent(QResizeEvent *event) { - m_size = e->size(); + m_size = event->size(); m_edit->setFixedHeight(m_size.height()); } -bool MySearchEdit::event(QEvent *e) +bool MySearchEdit::event(QEvent *event) { - if (e->type() == QEvent::FocusIn) { - const QFocusEvent *event = static_cast(e); + if (event->type() == QEvent::FocusIn) { + const QFocusEvent *ev = static_cast(event); - if (event->reason() == Qt::TabFocusReason - || event->reason() == Qt::BacktabFocusReason - || event->reason() == Qt::OtherFocusReason - || event->reason() == Qt::ShortcutFocusReason) { - toEditMode(); + if (ev->reason() == Qt::TabFocusReason + || ev->reason() == Qt::BacktabFocusReason + || ev->reason() == Qt::OtherFocusReason + || ev->reason() == Qt::ShortcutFocusReason) { + setEditFocus(); } } - return QFrame::event(e); + return QFrame::event(event); } diff --git a/plugins/systemmonitor/mysearchedit.h b/plugins/systemmonitor/mysearchedit.h index 8f5cb6b..4444c1c 100644 --- a/plugins/systemmonitor/mysearchedit.h +++ b/plugins/systemmonitor/mysearchedit.h @@ -17,36 +17,25 @@ public: ~MySearchEdit(); void initInsideFrame(); - QSize sizeHint() const {return m_size;} QSize minimumSizeHint() const {return m_size;} const QString text() const; - - void mousePressEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); - bool eventFilter(QObject *o, QEvent *e); - - inline void setAniDuration(const int duration) {m_animation->setDuration(duration);} - inline void setAniShowCurve(const QEasingCurve curve) {m_showCurve = curve;} - inline void setAniHideCurve(const QEasingCurve curve) {m_hideCurve = curve;} - QLineEdit *getLineEdit() const; public slots: - void toEditMode(); + void setEditFocus(); void setText(const QString & text) {if (m_edit) m_edit->setText(text);} inline void clear() {m_edit->clear();} signals: void textChanged(); - void returnPressed(); - void editingFinished(); - void focusOut(); - void focusIn(); protected: - void resizeEvent(QResizeEvent *e); - bool event(QEvent *e); + void resizeEvent(QResizeEvent *event); + bool event(QEvent *event); + void mousePressEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event); + bool eventFilter(QObject *object, QEvent *event); private: QSize m_size; diff --git a/plugins/systemmonitor/processdialog.cpp b/plugins/systemmonitor/processdialog.cpp index 142e3f4..c2b1966 100644 --- a/plugins/systemmonitor/processdialog.cpp +++ b/plugins/systemmonitor/processdialog.cpp @@ -163,27 +163,27 @@ ProcessDialog::ProcessDialog(QList columnShowOrHideFlags, int sortIndex, b m_killAction = new QAction(tr("Kill process"), this); connect(m_killAction, &QAction::triggered, this, &ProcessDialog::showKillProcessDialog); - priorityGroup = new MyActionGroup(this); - veryHighAction = new MyActionGroupItem(this, priorityGroup, "very_high_action", -20); - highAction = new MyActionGroupItem(this, priorityGroup, "high_action", -5); - normalAction = new MyActionGroupItem(this, priorityGroup, "normal_action", 0); - lowAction = new MyActionGroupItem(this, priorityGroup, "low_action", 5); - veryLowAction = new MyActionGroupItem(this, priorityGroup, "very_low_action", 19); - customAction = new MyActionGroupItem(this, priorityGroup, "custom_action", 32); - { - QAction *sep = new QAction(priorityGroup); - sep->setSeparator(true); - } - veryHighAction->change(tr("Very High")); - highAction->change(tr("High")); - normalAction->change(tr("Normal")); - lowAction->change(tr("Low")); - veryLowAction->change(tr("Very Low")); - customAction->change(tr("Custom")); - connect(priorityGroup, SIGNAL(activated(int)), this, SLOT(changeProcPriority(int))); - m_priorityMenu = new QMenu(); - m_priorityMenu->addActions(priorityGroup->actions()); - m_priorityMenu->menuAction()->setText(tr("Change Priority")); +// priorityGroup = new MyActionGroup(this); +// veryHighAction = new MyActionGroupItem(this, priorityGroup, "very_high_action", -20); +// highAction = new MyActionGroupItem(this, priorityGroup, "high_action", -5); +// normalAction = new MyActionGroupItem(this, priorityGroup, "normal_action", 0); +// lowAction = new MyActionGroupItem(this, priorityGroup, "low_action", 5); +// veryLowAction = new MyActionGroupItem(this, priorityGroup, "very_low_action", 19); +// customAction = new MyActionGroupItem(this, priorityGroup, "custom_action", 32); +// { +// QAction *sep = new QAction(priorityGroup); +// sep->setSeparator(true); +// } +// veryHighAction->change(tr("Very High")); +// highAction->change(tr("High")); +// normalAction->change(tr("Normal")); +// lowAction->change(tr("Low")); +// veryLowAction->change(tr("Very Low")); +// customAction->change(tr("Custom")); +// connect(priorityGroup, SIGNAL(activated(int)), this, SLOT(changeProcPriority(int))); +// m_priorityMenu = new QMenu(); +// m_priorityMenu->addActions(priorityGroup->actions()); +// m_priorityMenu->menuAction()->setText(tr("Change Priority")); m_propertiyAction = new QAction(tr("Properties"), this); connect(m_propertiyAction, &QAction::triggered, this, &ProcessDialog::showPropertiesDialog); @@ -192,8 +192,8 @@ ProcessDialog::ProcessDialog(QList columnShowOrHideFlags, int sortIndex, b m_menu->addAction(m_continueAction);//继续进程 m_menu->addAction(m_endAction);//结束 m_menu->addAction(m_killAction);//杀死 - m_menu->addSeparator(); - m_menu->addMenu(m_priorityMenu); +// m_menu->addSeparator(); +// m_menu->addMenu(m_priorityMenu); m_menu->addSeparator(); m_menu->addAction(m_propertiyAction); @@ -229,13 +229,13 @@ ProcessDialog::~ProcessDialog() delete m_continueAction; delete m_endAction; delete m_killAction; - delete veryHighAction; - delete highAction; - delete normalAction; - delete lowAction; - delete veryLowAction; - delete customAction; - delete m_priorityMenu; +// delete veryHighAction; +// delete highAction; +// delete normalAction; +// delete lowAction; +// delete veryLowAction; +// delete customAction; +// delete m_priorityMenu; delete m_propertiyAction; delete m_menu; delete actionPids; @@ -776,7 +776,7 @@ void ProcessDialog::popupMenu(QPoint pos, QList items) // qDebug() << "HAHAHAH===========" << cur_pid; actionPids->append(cur_pid); } - if (count == 1) { + /*if (count == 1) { ProcessWorker *info = ProcessWorker::find(cur_pid); if (!info) { priorityGroup->setActionsEnabled(false); @@ -800,7 +800,7 @@ void ProcessDialog::popupMenu(QPoint pos, QList items) } else { priorityGroup->setActionsEnabled(false); - } + }*/ m_menu->exec(pos); } diff --git a/plugins/systemmonitor/processdialog.h b/plugins/systemmonitor/processdialog.h index e9a7e54..68f2ab3 100644 --- a/plugins/systemmonitor/processdialog.h +++ b/plugins/systemmonitor/processdialog.h @@ -94,14 +94,14 @@ private: QAction *m_continueAction;//继续进程 QAction *m_endAction;//结束 QAction *m_killAction;//杀死 - QMenu *m_priorityMenu; - MyActionGroup * priorityGroup; - MyAction *veryHighAction; - MyAction *highAction; - MyAction *normalAction; - MyAction *lowAction; - MyAction *veryLowAction; - MyAction *customAction; +// QMenu *m_priorityMenu; +// MyActionGroup * priorityGroup; +// MyAction *veryHighAction; +// MyAction *highAction; +// MyAction *normalAction; +// MyAction *lowAction; +// MyAction *veryLowAction; +// MyAction *customAction; QList *actionPids; QMenu *m_menu; QString whose_processes; diff --git a/plugins/systemmonitor/processlistwidget.cpp b/plugins/systemmonitor/processlistwidget.cpp index b020e87..d58e424 100644 --- a/plugins/systemmonitor/processlistwidget.cpp +++ b/plugins/systemmonitor/processlistwidget.cpp @@ -407,6 +407,7 @@ void ProcessListWidget::mousePressEvent(QMouseEvent *mouseEvent) } else if (mouseEvent->button() == Qt::RightButton) { if (m_columnVisibles.count() == this->columnTitles.count()) { QMenu *menu = new QMenu(); + menu->setObjectName("MonitorMenu"); for (int i = 0; i < m_columnVisibles.count(); i++) { if (i != 0) {//让第一行总是显示，不可以设置显示或者不显示，其他行可以设置 QAction *action = new QAction(menu); @@ -424,6 +425,7 @@ void ProcessListWidget::mousePressEvent(QMouseEvent *mouseEvent) } menu->exec(this->mapToGlobal(mouseEvent->pos())); + delete menu; } } } @@ -644,6 +646,18 @@ void ProcessListWidget::paintEvent(QPaintEvent *) } painter.setClipPath(framePath); + //没有搜索结果时绘制提示文字 + if (this->m_searchText != "" && this->m_searchedItems->size() == 0) { + painter.setOpacity(1); + painter.setPen(QPen(QColor("#666666"))); + + QFont font = painter.font() ; + font.setPointSize(22); + painter.setFont(font); + + painter.drawText(QRect(rect().x(), rect().y() + this->m_titleHeight, rect().width(), rect().height() - this->m_titleHeight), Qt::AlignCenter, tr("No search result")); + } + //背景 QPen framePen; framePen.setColor(QColor("#F5F5F5")); diff --git a/plugins/systemmonitor/processmanager.cpp b/plugins/systemmonitor/processmanager.cpp index 37a929a..a049a0f 100644 --- a/plugins/systemmonitor/processmanager.cpp +++ b/plugins/systemmonitor/processmanager.cpp @@ -45,7 +45,7 @@ QString ProcessManager::getGuid() QString ProcessManager::getName() { - return tr("Process Manager"); + return tr("System Monitor"); } QString ProcessManager::getDescribe() diff --git a/plugins/systemmonitor/propertiesdialog.cpp b/plugins/systemmonitor/propertiesdialog.cpp index 031c0f1..0eae570 100644 --- a/plugins/systemmonitor/propertiesdialog.cpp +++ b/plugins/systemmonitor/propertiesdialog.cpp @@ -24,11 +24,10 @@ PropertiesDialog::PropertiesDialog(QWidget *parent, pid_t processId) : QDialog(p this->setMaximumSize(480, 600); this->setMinimumWidth(320); - this->resize(380, 120); +// this->resize(380, 120); pid = processId; - layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); @@ -83,6 +82,8 @@ PropertiesDialog::PropertiesDialog(QWidget *parent, pid_t processId) : QDialog(p cmdlineTitleLabel->setStyleSheet("QLabel { background-color : transparent; color : #666666; }"); cmdlineTitleLabel->setFixedWidth(100); cmdlineTitleLabel->setAlignment(Qt::AlignRight); +// cmdlineTitleLabel->setWordWrap(true); +// cmdlineTitleLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); cmdlineLabel = new QLabel(); cmdlineLabel->setStyleSheet("QLabel { background-color : transparent; color : #000000; }"); diff --git a/plugins/systemmonitor/systemmonitor.cpp b/plugins/systemmonitor/systemmonitor.cpp index 681bc9a..3d78d39 100644 --- a/plugins/systemmonitor/systemmonitor.cpp +++ b/plugins/systemmonitor/systemmonitor.cpp @@ -201,8 +201,7 @@ void SystemMonitor::initToolBar() void SystemMonitor::initConnections() { connect(m_toolBar, SIGNAL(changePage(int)), this, SLOT(onChangePage(int))); - connect(m_toolBar, SIGNAL(pressEsc()), process_dialog, SLOT(focusProcessView())); - connect(m_toolBar, SIGNAL(pressTab()), process_dialog, SLOT(focusProcessView())); + connect(m_toolBar, SIGNAL(canelSearchEditFocus()), process_dialog, SLOT(focusProcessView())); connect(m_toolBar, SIGNAL(searchSignal(QString)), process_dialog, SLOT(onSearch(QString)), Qt::QueuedConnection); } @@ -323,7 +322,7 @@ bool SystemMonitor::eventFilter(QObject *object, QEvent *event) QKeyEvent *keyEvent = static_cast(event); if (keyEvent->key() == Qt::Key_F) { if (keyEvent->modifiers() == Qt::ControlModifier) { - m_toolBar->focusInput(); + m_toolBar->setSearchEditFocus(); return false; } } diff --git a/plugins/systemmonitor/titlewidget.cpp b/plugins/systemmonitor/titlewidget.cpp index 137a4b4..37ef6e2 100644 --- a/plugins/systemmonitor/titlewidget.cpp +++ b/plugins/systemmonitor/titlewidget.cpp @@ -87,7 +87,7 @@ void TitleWidget::initLeftContent() QLabel *titleLabel = new QLabel; titleLabel->setStyleSheet("QLabel{background-color:transparent;color:#ffffff; font-size:12px;}"); - titleLabel->setText("Kyliln System Monitor"); + titleLabel->setText(tr("Kylin System Monitor")); m_lLayout->addSpacing(5); m_lLayout->addWidget(titleLabel); diff --git a/plugins/systemmonitor/toolbar.cpp b/plugins/systemmonitor/toolbar.cpp index d2f96e4..55e8b77 100644 --- a/plugins/systemmonitor/toolbar.cpp +++ b/plugins/systemmonitor/toolbar.cpp @@ -36,6 +36,7 @@ ToolBar::ToolBar(QSettings *settings, QWidget *parent) ToolBar::~ToolBar() { delete processLabel; + delete searchEdit; delete processCategory; //Segmentation fault QLayoutItem *child; @@ -65,13 +66,13 @@ bool ToolBar::eventFilter(QObject *obj, QEvent *event) QKeyEvent *keyEvent = static_cast(event); if (keyEvent->key() == Qt::Key_Escape) { searchEdit->clear(); - emit pressEsc(); + emit canelSearchEditFocus(); } } else if (obj == searchEdit->getLineEdit()) { QKeyEvent *keyEvent = static_cast(event); if (keyEvent->key() == Qt::Key_Tab) { - emit pressTab(); + emit canelSearchEditFocus(); } } } @@ -79,7 +80,7 @@ bool ToolBar::eventFilter(QObject *obj, QEvent *event) return QFrame::eventFilter(obj, event); } -void ToolBar::focusInput() +void ToolBar::setSearchEditFocus() { if (searchEdit->text() != "") { searchEdit->getLineEdit()->setFocus(); @@ -165,6 +166,8 @@ void ToolBar::initMiddleContent() disksButton->setChecked(false); if (!searchEdit->isVisible()) searchEdit->setVisible(true); + if (!processCategory->isVisible()) + processCategory->setVisible(true); }); connect(resourcesButton, &MyTipImageButton::clicked, this, [=] { emit this->changePage(1); @@ -173,6 +176,10 @@ void ToolBar::initMiddleContent() disksButton->setChecked(false); if (searchEdit->isVisible()) searchEdit->setVisible(false); + if (processCategory->isVisible()) + processCategory->setVisible(false); + searchEdit->clear(); + emit canelSearchEditFocus(); }); connect(disksButton, &MyTipImageButton::clicked, this, [=] { emit this->changePage(2); @@ -181,6 +188,10 @@ void ToolBar::initMiddleContent() disksButton->setChecked(true); if (searchEdit->isVisible()) searchEdit->setVisible(false); + if (processCategory->isVisible()) + processCategory->setVisible(false); + searchEdit->clear(); + emit canelSearchEditFocus(); }); processButton->setToolTip(tr("Processes")); resourcesButton->setToolTip(tr("Resources")); diff --git a/plugins/systemmonitor/toolbar.h b/plugins/systemmonitor/toolbar.h index 413a94d..a7d55a3 100644 --- a/plugins/systemmonitor/toolbar.h +++ b/plugins/systemmonitor/toolbar.h @@ -17,7 +17,7 @@ public: ToolBar(QSettings *settings, QWidget *parent); ~ToolBar(); - void focusInput(); + void setSearchEditFocus(); void initLeftContent(); void initMiddleContent(); void initRightContent(); @@ -34,8 +34,7 @@ public slots: signals: void changePage(int index); void searchSignal(QString searchContent); - void pressEsc(); - void pressTab(); + void canelSearchEditFocus(); void activeWhoseProcessList(int index); private: diff --git a/src/img.qrc b/src/img.qrc index fd8d107..a78fccc 100644 --- a/src/img.qrc +++ b/src/img.qrc @@ -216,6 +216,8 @@ res/tool/close_press.png res/arrow_right.png res/search.png + res/ok.png + res/menu_selected.png res/sysBtn/close_button.png diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b26dbeb..c25dd1f 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -691,7 +691,7 @@ inline QString getPluginsDirectory() { if (isRunningInstalled()) { return QString("/usr/lib/kylin-assistant/plugins/"); } else { - return QString(QCoreApplication::applicationDirPath() + "plugins/"); + return QString(QCoreApplication::applicationDirPath() + "/plugins/"); } } @@ -923,20 +923,20 @@ void MainWindow::reViewTheOrgSkin() } void MainWindow::showMainMenu() { - if (this->arch == "aarch64" || this->osName == "Kylin" || this->osName == "YHKylin") - { +// if (this->arch == "aarch64" || this->osName == "Kylin" || this->osName == "YHKylin") +// { QPoint p = rect().topRight(); p.setX(p.x() - 180); p.setY(p.y() + 22); main_menu->exec(this->mapToGlobal(p)); - } - else - { - QPoint p = rect().topLeft(); - p.setX(p.x() + 107);//104 - p.setY(p.y() + 22); - main_menu->exec(this->mapToGlobal(p)); - } +// } +// else +// { +// QPoint p = rect().topLeft(); +// p.setX(p.x() + 107);//104 +// p.setY(p.y() + 22); +// main_menu->exec(this->mapToGlobal(p)); +// } // //向上弹出menu // QPoint pos; @@ -985,7 +985,7 @@ void MainWindow::setCurrentPageIndex(int index) } else if(index == 1) { - if (this->arch == "aarch64" || this->osName == "Kylin" || this->osName == "YHKylin") +// if (this->arch == "aarch64" || this->osName == "Kylin" || this->osName == "YHKylin") // login_widget->hide(); if (status == HOMEPAGE) { statusFlag = true; @@ -1020,7 +1020,7 @@ void MainWindow::setCurrentPageIndex(int index) } else if(index == 2) { - if (this->arch == "aarch64" || this->osName == "Kylin" || this->osName == "YHKylin" ) +// if (this->arch == "aarch64" || this->osName == "Kylin" || this->osName == "YHKylin" ) // login_widget->hide(); if (status == HOMEPAGE) { statusFlag = true; @@ -1059,30 +1059,30 @@ void MainWindow::setCurrentPageIndex(int index) statusFlag = true; else statusFlag = false; - if (this->arch == "aarch64" || this->osName == "Kylin" || this->osName == "YHKylin" ) - { +// if (this->arch == "aarch64" || this->osName == "Kylin" || this->osName == "YHKylin" ) +// { // login_widget->hide(); - if (status != BOXPAGE && statusFlag) { - shadow_widget->show(); - tool_widget->hide(); - if(title_widget->isVisible()) - title_widget->hide(); - // topStack->setCurrentIndex(3); - // bottomStack->setCurrentIndex(3); - topStack->setCurrentWidget(box_action_widget); - bottomStack->setCurrentWidget(box_widget); - spreadGroup->start(); - status = BOXPAGE; - } - else { - // topStack->setCurrentIndex(3); - // bottomStack->setCurrentIndex(3); - topStack->setCurrentWidget(box_action_widget); - bottomStack->setCurrentWidget(box_widget); - } - } - else - { +// if (status != BOXPAGE && statusFlag) { +// shadow_widget->show(); +// tool_widget->hide(); +// if(title_widget->isVisible()) +// title_widget->hide(); +// // topStack->setCurrentIndex(3); +// // bottomStack->setCurrentIndex(3); +// topStack->setCurrentWidget(box_action_widget); +// bottomStack->setCurrentWidget(box_widget); +// spreadGroup->start(); +// status = BOXPAGE; +// } +// else { +// // topStack->setCurrentIndex(3); +// // bottomStack->setCurrentIndex(3); +// topStack->setCurrentWidget(box_action_widget); +// bottomStack->setCurrentWidget(box_widget); +// } +// } +// else +// { if (status != SETTINGPAGE && statusFlag) { shadow_widget->show(); tool_widget->hide(); @@ -1107,12 +1107,12 @@ void MainWindow::setCurrentPageIndex(int index) topStack->setCurrentWidget(setting_action_widget); bottomStack->setCurrentWidget(setting_widget); } - } +// } } else if(index == 4) { - if (this->arch != "aarch64" && this->osName != "Kylin" && this->osName != "YHKylin") - { +// if (this->arch != "aarch64" && this->osName != "Kylin" && this->osName != "YHKylin") +// { if (status == HOMEPAGE) statusFlag = true; else @@ -1141,7 +1141,7 @@ void MainWindow::setCurrentPageIndex(int index) topStack->setCurrentWidget(box_action_widget); bottomStack->setCurrentWidget(box_widget); } - } +// } } } @@ -1360,8 +1360,22 @@ void MainWindow::mouseMoveEvent(QMouseEvent *event) } } -//void MainWindow::paintEvent(QPaintEvent *event) -//{ +/*void MainWindow::paintEvent(QPaintEvent *event) +{ + QPainter painter(this); + + painter.setRenderHint(QPainter::Antialiasing, true); + painter.setOpacity(0.05); + + int penWidth = 1; + QPainterPath framePath; + framePath.addRoundedRect(QRect(rect().x() + penWidth, rect().y() + penWidth, rect().width() - penWidth * 2, rect().height() - penWidth * 2), 4, 4);//背景弧度 + painter.setClipPath(framePath); + + QPen framePen; + framePen.setColor(QColor("#F5F5F5")); + painter.setOpacity(0.2); + painter.drawPath(framePath); // QPainterPath path; // path.setFillRule(Qt::WindingFill); // path.addRect(10, 10, this->width()-20, this->height()-20); @@ -1380,4 +1394,4 @@ void MainWindow::mouseMoveEvent(QMouseEvent *event) // painter.setPen(color); // painter.drawPath(path); // } -//} +}*/ diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp index 67a7e31..d0e5197 100644 --- a/src/pluginmanager.cpp +++ b/src/pluginmanager.cpp @@ -39,7 +39,8 @@ PluginManager* PluginManager::Instance() bool PluginManager::loadPlugin(QString plugin_path) { - QDir pluginsDir(plugin_path/* + "/libs"*/); +// qDebug() << "plugin_path="<instance(); @@ -75,47 +76,3 @@ bool PluginManager::unloadPlugin(QString plugin_guid) plugin_map.erase(iter); return true; } - - -/*PluginManager::PluginManager(QObject *parent) - : QObject(parent) -{ -} - -PluginManager::~PluginManager(void) -{ -} - -PluginManager* PluginManager::Instance() -{ - static PluginManager PluginMgr; - return &PluginMgr; -} - -void PluginManager::loadPlugin(QString plugin_path) -{ - QDir pluginsDir(plugin_path + "/libs"); - - const QStringList plugins = pluginsDir.entryList(QStringList("*.so"), QDir::Files); - for (const QString file : plugins) - { - if (!QLibrary::isLibrary(file)) - continue; - - QPluginLoader *pluginLoader = new QPluginLoader(pluginsDir.absoluteFilePath(file), this); - PluginInterface *interface = qobject_cast(pluginLoader->instance()); - if (!interface) - { - qWarning() << pluginLoader->errorString(); - pluginLoader->unload(); - pluginLoader->deleteLater(); - return; - } else { - qDebug() << "The plugin interface is: " << interface; - } - - QWidget *w = interface->centralWidget(); - w->setVisible(false); - emit pluginAdded(w); - } -}*/ diff --git a/src/res/menu_selected.png b/src/res/menu_selected.png new file mode 100644 index 0000000..4835e96 Binary files /dev/null and b/src/res/menu_selected.png differ diff --git a/src/res/ok.png b/src/res/ok.png new file mode 100644 index 0000000..57e8a91 Binary files /dev/null and b/src/res/ok.png differ diff --git a/src/res/qss/kylin-assistant.qss b/src/res/qss/kylin-assistant.qss index 1d9ea40..69403d5 100644 --- a/src/res/qss/kylin-assistant.qss +++ b/src/res/qss/kylin-assistant.qss @@ -630,6 +630,56 @@ QMenu::indicator { height: 13px; } +/*---------Monitor--------*/ +QMenu#MonitorMenu{ + background-color: white; + border: 1px solid gray; + margin:1px; +} + +QMenu#MonitorMenu::icon { + position: absolute; + left: 21px; +} + +QMenu#MonitorMenu::item { + padding:0px 0px 0px 45px;/*item的文字距离item的上右下左的距离: top right bottom left*/ + margin-left: 0px; + border:1px solid #2e2e2e; + height:25px; + color: #999999; + font-size:12px; + font-family:方正黑体_GBK; + background-color: transparent; + border: 1px solid transparent; +} + +QMenu#MonitorMenu::item:selected:enabled{ + background: #0da4f6; + color: #ffffff; +} + +QMenu#MonitorMenu::item:selected:!enabled{ + background:transparent; +} + +/*分割线*/ +QMenu#MonitorMenu::separator{ + height:1px; + background: #3b3b3b; + margin:2px 0px 2px 0px; +} + +QMenu#MonitorMenu::indicator:exclusive:checked { + image: url(:/res/menu_selected.png); +} + +QMenu#MonitorMenu::indicator:non-exclusive:checked{ + image:url(:/res/ok.png); +} + + + /*-------------------QRadioButton-------------------*/ QRadioButton { spacing: 5px; diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index dba5789..b075055 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -97,3 +97,21 @@ void TitleWidget::initConnect() { connect(skin_button, SIGNAL(clicked()), p_mainwindow, SLOT(openSkinCenter())); connect(main_menu_button, SIGNAL(clicked()), p_mainwindow, SLOT(showMainMenu())); } + +/*void TitleWidget::paintEvent(QPaintEvent *event) +{ + QPainter painter(this); + + painter.setRenderHint(QPainter::Antialiasing, true); + painter.setOpacity(0.05); + + int penWidth = 1; + QPainterPath framePath; + framePath.addRoundedRect(QRect(rect().x() + penWidth, rect().y() + penWidth, rect().width() - penWidth * 2, rect().height() - penWidth * 2), 4, 4);//背景弧度 + painter.setClipPath(framePath); + + QPen framePen; + framePen.setColor(QColor("#F5F5F5")); + painter.setOpacity(0.2); + painter.drawPath(framePath); +}*/ diff --git a/src/titlewidget.h b/src/titlewidget.h index 310fab0..df8e351 100644 --- a/src/titlewidget.h +++ b/src/titlewidget.h @@ -41,6 +41,9 @@ public: void setParentWindow(MainWindow* window) { p_mainwindow = window;} void initConnect(); +//protected: +// virtual void paintEvent(QPaintEvent *event); + signals: void closeApp(); diff --git a/src/translation/kylin-assistant_de.ts b/src/translation/kylin-assistant_de.ts index 3be94f7..0a7c018 100644 --- a/src/translation/kylin-assistant_de.ts +++ b/src/translation/kylin-assistant_de.ts @@ -142,13 +142,13 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> BoxWidget - - + + Kylin Software Center - + Boot Manager @@ -455,7 +455,7 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> CleanerItems - + OK @@ -1429,60 +1429,60 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> FontWidget + + - - Click here to change font - + Default Font - + Desktop Font - + Monospace Font - + Document Font - + Titlebar Font - + Global Font Scaling - + Hinting - + Antialiasing + + - - Restore @@ -1696,47 +1696,47 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> HomePage - + Boot Manager - + Current Version Number - + Update to the lastest version, make it work better - + updating on the backend - + Common toolbox - + Fast and practical, making the system more personalized - + Upgrade is complete - + Updating on the backend - + More @@ -1947,59 +1947,6 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> - - LauncherWidget - - - Launcher icon size - - - - - Launcher hide mode - - - - - Display desktop icon - - - - - Launcher Transparency - - - - - Icon Background - - - - - Top panel icon size - - - - - Top panel auto hide - - - - - Bottom panel icon size - - - - - Bottom panel auto hide - - - - - Launcher position - - - LoginWidget @@ -2016,8 +1963,7 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> MainWindow - - + Kylin Assistant @@ -2213,11 +2159,224 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> + + ProcessDialog + + + + + End process + + + + + Ending a process may destroy data, break the session or introduce a security risk. Only unresponsive processes should be ended. +Are you sure to continue? + + + + + + Cancel + + + + + + + Kill process + + + + + Killing a process may destroy data, break the session or introduce a security risk. Only unresponsive processes should be killed. +Are you sure to continue? + + + + + Stop process + + + + + Continue process + + + + + Properties + + + + + ProcessListItem + + + Stopped + + + + + Suspend + + + + + Zombie + + + + + No response + + + + + + Uninterruptible + + + + + ProcessListWidget + + + Process Name + + + + + User + + + + + Status + + + + + CPU + + + + + ID + + + + + Command Line + + + + + Memory + + + + + Priority + + + + + No search result + + + + + ProcessManager + + + System Monitor + + + + + Help user to kill process + + + + + PropertiesDialog + + + User name + + + + + Process name + + + + + Command line + + + + + CPU Time + + + + + Started Time + + + QObject - - kylin-assistant had already running! + + Running + + + + + Stopped + + + + + Zombie + + + + + Uninterruptible + + + + + Sleeping + + + + + Very High + + + + + High + + + + + Normal + + + + + Low + + + + + Very Low @@ -2429,40 +2588,40 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> ShredDialog - - + + Shred Manager - - - + + + No select any file which need to be shredded - + Shred File - + Deselect - + Select file! - + Shred successfully! - + Shred failed! @@ -2470,12 +2629,12 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> ShredManager - + Shred Manager - + Delete files makes it unable to recover @@ -2483,28 +2642,28 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> SkinCenter - - + + Skin Setting - + Default - + Custom - + Open File - + Files(*.png *.jpg) @@ -2549,6 +2708,32 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> + + TitleWidget + + + Kylin System Monitor + + + + + ToolBar + + + Processes + + + + + Resources + + + + + File Systems + + + ToolWidget @@ -2636,116 +2821,116 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> UpgradeDialog - + check and update - - + + Current verison: - + Official version - + An error occurred! - + Network or local sources anomaly - + you can visit the<a style='color: #3f96e4;' href = http://www.ubuntukylin.com> UK official website</a> to download the lastest deb package - + Retry - + Finish - + Upgrade - - + + Start to update the local sources - + Start to download - + Updating local sources... - + Start to install - + Download completely - + Local sources updated - + Found a new version - + New version: - - + + Not found - - + + Testing network and local sources... - + Kylin Assistant is the latest version - + Upgrading the main program... - + Start to upgrade the main program diff --git a/src/translation/kylin-assistant_es.ts b/src/translation/kylin-assistant_es.ts index 77997ee..04869e3 100644 --- a/src/translation/kylin-assistant_es.ts +++ b/src/translation/kylin-assistant_es.ts @@ -142,13 +142,13 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> BoxWidget - - + + Kylin Software Center - + Boot Manager @@ -455,7 +455,7 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> CleanerItems - + OK @@ -1429,60 +1429,60 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> FontWidget + + - - Click here to change font - + Default Font - + Desktop Font - + Monospace Font - + Document Font - + Titlebar Font - + Global Font Scaling - + Hinting - + Antialiasing + + - - Restore @@ -1696,47 +1696,47 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> HomePage - + Boot Manager - + Current Version Number - + Update to the lastest version, make it work better - + updating on the backend - + Common toolbox - + Fast and practical, making the system more personalized - + Upgrade is complete - + Updating on the backend - + More @@ -1947,59 +1947,6 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> - - LauncherWidget - - - Launcher icon size - - - - - Launcher hide mode - - - - - Display desktop icon - - - - - Launcher Transparency - - - - - Icon Background - - - - - Top panel icon size - - - - - Top panel auto hide - - - - - Bottom panel icon size - - - - - Bottom panel auto hide - - - - - Launcher position - - - LoginWidget @@ -2016,8 +1963,7 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> MainWindow - - + Kylin Assistant @@ -2213,11 +2159,224 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> + + ProcessDialog + + + + + End process + + + + + Ending a process may destroy data, break the session or introduce a security risk. Only unresponsive processes should be ended. +Are you sure to continue? + + + + + + Cancel + + + + + + + Kill process + + + + + Killing a process may destroy data, break the session or introduce a security risk. Only unresponsive processes should be killed. +Are you sure to continue? + + + + + Stop process + + + + + Continue process + + + + + Properties + + + + + ProcessListItem + + + Stopped + + + + + Suspend + + + + + Zombie + + + + + No response + + + + + + Uninterruptible + + + + + ProcessListWidget + + + Process Name + + + + + User + + + + + Status + + + + + CPU + + + + + ID + + + + + Command Line + + + + + Memory + + + + + Priority + + + + + No search result + + + + + ProcessManager + + + System Monitor + + + + + Help user to kill process + + + + + PropertiesDialog + + + User name + + + + + Process name + + + + + Command line + + + + + CPU Time + + + + + Started Time + + + QObject - - kylin-assistant had already running! + + Running + + + + + Stopped + + + + + Zombie + + + + + Uninterruptible + + + + + Sleeping + + + + + Very High + + + + + High + + + + + Normal + + + + + Low + + + + + Very Low @@ -2429,40 +2588,40 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> ShredDialog - - + + Shred Manager - - - + + + No select any file which need to be shredded - + Shred File - + Deselect - + Select file! - + Shred successfully! - + Shred failed! @@ -2470,12 +2629,12 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> ShredManager - + Shred Manager - + Delete files makes it unable to recover @@ -2483,28 +2642,28 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> SkinCenter - - + + Skin Setting - + Default - + Custom - + Open File - + Files(*.png *.jpg) @@ -2549,6 +2708,32 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> + + TitleWidget + + + Kylin System Monitor + + + + + ToolBar + + + Processes + + + + + Resources + + + + + File Systems + + + ToolWidget @@ -2636,116 +2821,116 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> UpgradeDialog - + check and update - - + + Current verison: - + Official version - + An error occurred! - + Network or local sources anomaly - + you can visit the<a style='color: #3f96e4;' href = http://www.ubuntukylin.com> UK official website</a> to download the lastest deb package - + Retry - + Finish - + Upgrade - - + + Start to update the local sources - + Start to download - + Updating local sources... - + Start to install - + Download completely - + Local sources updated - + Found a new version - + New version: - - + + Not found - - + + Testing network and local sources... - + Kylin Assistant is the latest version - + Upgrading the main program... - + Start to upgrade the main program diff --git a/src/translation/kylin-assistant_fr.ts b/src/translation/kylin-assistant_fr.ts index bf4e074..4ee31b1 100644 --- a/src/translation/kylin-assistant_fr.ts +++ b/src/translation/kylin-assistant_fr.ts @@ -142,13 +142,13 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> BoxWidget - - + + Kylin Software Center - + Boot Manager @@ -455,7 +455,7 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> CleanerItems - + OK @@ -1429,60 +1429,60 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> FontWidget + + - - Click here to change font - + Default Font - + Desktop Font - + Monospace Font - + Document Font - + Titlebar Font - + Global Font Scaling - + Hinting - + Antialiasing + + - - Restore @@ -1696,47 +1696,47 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> HomePage - + Boot Manager - + Current Version Number - + Update to the lastest version, make it work better - + updating on the backend - + Common toolbox - + Fast and practical, making the system more personalized - + Upgrade is complete - + Updating on the backend - + More @@ -1947,59 +1947,6 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> - - LauncherWidget - - - Launcher icon size - - - - - Launcher hide mode - - - - - Display desktop icon - - - - - Launcher Transparency - - - - - Icon Background - - - - - Top panel icon size - - - - - Top panel auto hide - - - - - Bottom panel icon size - - - - - Bottom panel auto hide - - - - - Launcher position - - - LoginWidget @@ -2016,8 +1963,7 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> MainWindow - - + Kylin Assistant @@ -2213,11 +2159,224 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> + + ProcessDialog + + + + + End process + + + + + Ending a process may destroy data, break the session or introduce a security risk. Only unresponsive processes should be ended. +Are you sure to continue? + + + + + + Cancel + + + + + + + Kill process + + + + + Killing a process may destroy data, break the session or introduce a security risk. Only unresponsive processes should be killed. +Are you sure to continue? + + + + + Stop process + + + + + Continue process + + + + + Properties + + + + + ProcessListItem + + + Stopped + + + + + Suspend + + + + + Zombie + + + + + No response + + + + + + Uninterruptible + + + + + ProcessListWidget + + + Process Name + + + + + User + + + + + Status + + + + + CPU + + + + + ID + + + + + Command Line + + + + + Memory + + + + + Priority + + + + + No search result + + + + + ProcessManager + + + System Monitor + + + + + Help user to kill process + + + + + PropertiesDialog + + + User name + + + + + Process name + + + + + Command line + + + + + CPU Time + + + + + Started Time + + + QObject - - kylin-assistant had already running! + + Running + + + + + Stopped + + + + + Zombie + + + + + Uninterruptible + + + + + Sleeping + + + + + Very High + + + + + High + + + + + Normal + + + + + Low + + + + + Very Low @@ -2429,40 +2588,40 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> ShredDialog - - + + Shred Manager - - - + + + No select any file which need to be shredded - + Shred File - + Deselect - + Select file! - + Shred successfully! - + Shred failed! @@ -2470,12 +2629,12 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> ShredManager - + Shred Manager - + Delete files makes it unable to recover @@ -2483,28 +2642,28 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> SkinCenter - - + + Skin Setting - + Default - + Custom - + Open File - + Files(*.png *.jpg) @@ -2549,6 +2708,32 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> + + TitleWidget + + + Kylin System Monitor + + + + + ToolBar + + + Processes + + + + + Resources + + + + + File Systems + + + ToolWidget @@ -2636,116 +2821,116 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> UpgradeDialog - + check and update - - + + Current verison: - + Official version - + An error occurred! - + Network or local sources anomaly - + you can visit the<a style='color: #3f96e4;' href = http://www.ubuntukylin.com> UK official website</a> to download the lastest deb package - + Retry - + Finish - + Upgrade - - + + Start to update the local sources - + Start to download - + Updating local sources... - + Start to install - + Download completely - + Local sources updated - + Found a new version - + New version: - - + + Not found - - + + Testing network and local sources... - + Kylin Assistant is the latest version - + Upgrading the main program... - + Start to upgrade the main program diff --git a/src/translation/kylin-assistant_ru.ts b/src/translation/kylin-assistant_ru.ts index 6822e34..7aedf5f 100644 --- a/src/translation/kylin-assistant_ru.ts +++ b/src/translation/kylin-assistant_ru.ts @@ -142,13 +142,13 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> BoxWidget - - + + Kylin Software Center - + Boot Manager @@ -455,7 +455,7 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> CleanerItems - + OK @@ -1429,60 +1429,60 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> FontWidget + + - - Click here to change font - + Default Font - + Desktop Font - + Monospace Font - + Document Font - + Titlebar Font - + Global Font Scaling - + Hinting - + Antialiasing + + - - Restore @@ -1696,47 +1696,47 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> HomePage - + Boot Manager - + Current Version Number - + Update to the lastest version, make it work better - + updating on the backend - + Common toolbox - + Fast and practical, making the system more personalized - + Upgrade is complete - + Updating on the backend - + More @@ -1947,59 +1947,6 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> - - LauncherWidget - - - Launcher icon size - - - - - Launcher hide mode - - - - - Display desktop icon - - - - - Launcher Transparency - - - - - Icon Background - - - - - Top panel icon size - - - - - Top panel auto hide - - - - - Bottom panel icon size - - - - - Bottom panel auto hide - - - - - Launcher position - - - LoginWidget @@ -2016,8 +1963,7 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> MainWindow - - + Kylin Assistant @@ -2213,11 +2159,224 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> + + ProcessDialog + + + + + End process + + + + + Ending a process may destroy data, break the session or introduce a security risk. Only unresponsive processes should be ended. +Are you sure to continue? + + + + + + Cancel + + + + + + + Kill process + + + + + Killing a process may destroy data, break the session or introduce a security risk. Only unresponsive processes should be killed. +Are you sure to continue? + + + + + Stop process + + + + + Continue process + + + + + Properties + + + + + ProcessListItem + + + Stopped + + + + + Suspend + + + + + Zombie + + + + + No response + + + + + + Uninterruptible + + + + + ProcessListWidget + + + Process Name + + + + + User + + + + + Status + + + + + CPU + + + + + ID + + + + + Command Line + + + + + Memory + + + + + Priority + + + + + No search result + + + + + ProcessManager + + + System Monitor + + + + + Help user to kill process + + + + + PropertiesDialog + + + User name + + + + + Process name + + + + + Command line + + + + + CPU Time + + + + + Started Time + + + QObject - - kylin-assistant had already running! + + Running + + + + + Stopped + + + + + Zombie + + + + + Uninterruptible + + + + + Sleeping + + + + + Very High + + + + + High + + + + + Normal + + + + + Low + + + + + Very Low @@ -2429,40 +2588,40 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> ShredDialog - - + + Shred Manager - - - + + + No select any file which need to be shredded - + Shred File - + Deselect - + Select file! - + Shred successfully! - + Shred failed! @@ -2470,12 +2629,12 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> ShredManager - + Shred Manager - + Delete files makes it unable to recover @@ -2483,28 +2642,28 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> SkinCenter - - + + Skin Setting - + Default - + Custom - + Open File - + Files(*.png *.jpg) @@ -2549,6 +2708,32 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> + + TitleWidget + + + Kylin System Monitor + + + + + ToolBar + + + Processes + + + + + Resources + + + + + File Systems + + + ToolWidget @@ -2636,116 +2821,116 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> UpgradeDialog - + check and update - - + + Current verison: - + Official version - + An error occurred! - + Network or local sources anomaly - + you can visit the<a style='color: #3f96e4;' href = http://www.ubuntukylin.com> UK official website</a> to download the lastest deb package - + Retry - + Finish - + Upgrade - - + + Start to update the local sources - + Start to download - + Updating local sources... - + Start to install - + Download completely - + Local sources updated - + Found a new version - + New version: - - + + Not found - - + + Testing network and local sources... - + Kylin Assistant is the latest version - + Upgrading the main program... - + Start to upgrade the main program diff --git a/src/translation/kylin-assistant_zh_CN.qm b/src/translation/kylin-assistant_zh_CN.qm index dd0dae5..ddebcff 100644 Binary files a/src/translation/kylin-assistant_zh_CN.qm and b/src/translation/kylin-assistant_zh_CN.qm differ diff --git a/src/translation/kylin-assistant_zh_CN.ts b/src/translation/kylin-assistant_zh_CN.ts index ac6dbea..091d3a4 100644 --- a/src/translation/kylin-assistant_zh_CN.ts +++ b/src/translation/kylin-assistant_zh_CN.ts @@ -145,13 +145,13 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> BoxWidget - - + + Kylin Software Center 麒麟软件中心 - + Boot Manager 启动项管理 @@ -478,7 +478,7 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> CleanerItems - + OK 确定 @@ -1456,60 +1456,60 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> FontWidget + + - - Click here to change font 点击此处更换字体 - + Default Font 默认字体 - + Desktop Font 桌面字体 - + Monospace Font 等宽字体 - + Document Font 文档字体 - + Titlebar Font 标题栏字体 - + Global Font Scaling 全局字体缩放 - + Hinting 平滑 - + Antialiasing 反锯齿 + + - - Restore 恢复默认 @@ -1723,7 +1723,7 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> HomePage - + Boot Manager 启动项管理 @@ -1732,42 +1732,42 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> 摄像头 - + Current Version Number 当前版本号 - + Update to the lastest version, make it work better 更新至最新版本，使软件更好用 - + updating on the backend 正在后台升级 - + Upgrade is complete 升级完成 - + Updating on the backend 正在后台升级 - + Common toolbox 工具箱 - + Fast and practical, making the system more personalized 更快更好，让系统更具个性化 - + More 更多 @@ -1982,54 +1982,44 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> LauncherWidget - Launcher icon size - 启动器图标尺寸 + 启动器图标尺寸 - Launcher hide mode - 启动器自动隐藏 + 启动器自动隐藏 - Display desktop icon - 显示桌面图标 + 显示桌面图标 - Launcher Transparency - 启动器透明度 + 启动器透明度 - Icon Background - 图标背景 + 图标背景 - Top panel icon size - 顶部面板图标大小 + 顶部面板图标大小 - Top panel auto hide - 顶部面板自动隐藏 + 顶部面板自动隐藏 - Bottom panel icon size - 底部面板图标大小 + 底部面板图标大小 - Bottom panel auto hide - 底部面板自动隐藏 + 底部面板自动隐藏 - Launcher position - 启动器位置 + 启动器位置 @@ -2048,8 +2038,7 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> MainWindow - - + Kylin Assistant 麒麟助手 @@ -2249,12 +2238,259 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> 显示图标 + + ProcessDialog + + + + + End process + 结束进程 + + + + Ending a process may destroy data, break the session or introduce a security risk. Only unresponsive processes should be ended. +Are you sure to continue? + 结束进程可能导致数据损坏，中断会话或带来安全风险。您应该只结束无响应的进程。 +您确定要继续该操作？ + + + + + Cancel + 取消 + + + + + + Kill process + 杀死进程 + + + + Killing a process may destroy data, break the session or introduce a security risk. Only unresponsive processes should be killed. +Are you sure to continue? + 杀死进程可能导致数据损坏，中断会话或带来安全风险。您应该只杀死无响应的进程。 +您确定要继续该操作？ + + + + Stop process + 停止进程 + + + + Continue process + 继续进程 + + + Very High + 非常高 + + + High + 高 + + + Normal + 普通 + + + Low + 低 + + + Very Low + 非常低 + + + Custom + 自定义 + + + Change Priority + 改变优先级 + + + + Properties + 属性 + + + + ProcessListItem + + + Stopped + 已停止 + + + + Suspend + 停止 + + + + Zombie + 僵死 + + + + No response + 无反应 + + + + + Uninterruptible + 不可中断 + + + + ProcessListWidget + + + Process Name + 进程名 + + + + User + 用户 + + + + Status + 状态 + + + + CPU + 处理器 + + + + ID + ID + + + + Command Line + 命令行 + + + + Memory + 内存 + + + + Priority + 优先级 + + + + No search result + 无搜索结果 + + + + ProcessManager + + + System Monitor + 系统监视器 + + + + Help user to kill process + 帮助用户管理进程 + + + + PropertiesDialog + + + User name + 用户 + + + + Process name + 进程名 + + + + Command line + 命令行 + + + + CPU Time + CPU 时间 + + + + Started Time + 开始于 + + QObject - kylin-assistant had already running! - 麒麟助手运行中 + 麒麟助手运行中 + + + + Running + 运行中 + + + + Stopped + 已停止 + + + + Zombie + 僵死 + + + + Uninterruptible + 不可中断 + + + + Sleeping + 睡眠中 + + + + Very High + 非常高 + + + + High + 高 + + + + Normal + 普通 + + + + Low + 低 + + + + Very Low + 非常低 @@ -2465,25 +2701,25 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> ShredDialog - - + + Shred Manager 文件粉碎机 - - - + + + No select any file which need to be shredded 没有选择需要粉碎的文件 - + Shred File 粉碎文件 - + Deselect 取消粉碎 @@ -2492,17 +2728,17 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> 所有文件(*) - + Select file! 选择文件！ - + Shred successfully! 粉碎成功！ - + Shred failed! 粉碎失败！ @@ -2510,12 +2746,12 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> ShredManager - + Shred Manager 文件粉碎机 - + Delete files makes it unable to recover 彻底删除文件使其无法恢复 @@ -2523,28 +2759,28 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> SkinCenter - - + + Skin Setting 皮肤设置 - + Default 默认皮肤 - + Custom 自定义 - + Open File 打开文件 - + Files(*.png *.jpg) 文件(*.png *.jpg) @@ -2589,6 +2825,32 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> 提示框 + + TitleWidget + + + Kylin System Monitor + 麒麟系统监视器 + + + + ToolBar + + + Processes + 进程 + + + + Resources + 资源 + + + + File Systems + 文件系统 + + ToolWidget @@ -2676,116 +2938,116 @@ Kylin Team <ubuntukylin-members@list.launchpad.net> UpgradeDialog - + check and update 检查更新 - - + + Current verison: 当前版本： - + Official version 正式版 - + An error occurred! 出错了！无法升级 - + Network or local sources anomaly 网络或源地址连接失败，升级未成功 - - + + Testing network and local sources... 正在检查网络和本地源... - + Retry 重试 - + Finish 完成 - + Upgrade 升级 - - + + Start to update the local sources 开始更新本地源 - + Start to download 开始下载 - + Updating local sources... 正在更新本地源... - + Kylin Assistant is the latest version 麒麟助手已经是最新的版本 - + Start to install 开始安装 - + Download completely 下载完成 - + Local sources updated 源更新完毕 - + Found a new version 发现新版本 - + New version: 新版本号： - + you can visit the<a style='color: #3f96e4;' href = http://www.ubuntukylin.com> UK official website</a> to download the lastest deb package 您可以访问 <a style='color: #3f96e4;' href = http://www.ubuntukylin.com> UK 官网</a> 下载最新的deb包 - - + + Not found 没有发现新版本 - + Upgrading the main program... 正在升级主程序... - + Start to upgrade the main program 开始升级主程序