Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: add commandline option #151

Merged
merged 1 commit into from
Aug 29, 2023
Merged

chore: add commandline option #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions dde-clipboard/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@ int main(int argc, char *argv[])
app->setApplicationName("dde-clipboard");
app->setApplicationDisplayName("DDE Clipboard");
app->setApplicationVersion("1.0");

QCommandLineOption alwaysShowOption("always-show" , "show and will never hide");

QCommandLineParser parser;

parser.setApplicationDescription("DDE Clipboard");
parser.addVersionOption();
parser.addHelpOption();
parser.addOption(alwaysShowOption);

parser.process(*app);

app->loadTranslator();

if (!DGuiApplicationHelper::setSingleInstance(QString("dde-clipboard_%1").arg(getuid()))) {
Expand All @@ -36,11 +48,17 @@ int main(int argc, char *argv[])

DLogManager::registerConsoleAppender();
DLogManager::registerFileAppender();
DLogManager::registerJournalAppender();

QDBusConnection connection = QDBusConnection::sessionBus();

MainWindow w;

bool alwaysShow = parser.isSet(alwaysShowOption);
if (alwaysShow) {
w.setAlwaysShow(true);
}

QDBusInterface interface("org.deepin.dde.ClipboardLoader1", "/org/deepin/dde/ClipboardLoader1",
"org.deepin.dde.ClipboardLoader1",
QDBusConnection::sessionBus());
Expand All @@ -53,9 +71,9 @@ int main(int argc, char *argv[])

connection.registerObject(DBusClipBoardPath, &w);

#ifdef QT_DEBUG
w.showAni();
#endif
if (alwaysShow) {
w.showAni();
}

return app->exec();
}
6 changes: 6 additions & 0 deletions dde-clipboard/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ void MainWindow::showAni()

void MainWindow::hideAni()
{
if (m_alwaysShow) {
return;
}
if (!m_hasComposite) {
hide();
return;
Expand All @@ -133,6 +136,9 @@ void MainWindow::Show()

void MainWindow::Hide()
{
if (m_alwaysShow) {
return;
}
if (m_aniGroup->state() == QAbstractAnimation::Running)
return;

Expand Down
5 changes: 5 additions & 0 deletions dde-clipboard/mainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ class MainWindow : public DBlurEffectWidget
Q_PROPERTY(double Opacity READ opacity NOTIFY OpacityChanged)
double opacity();

void setAlwaysShow(bool alwaysShow) {
m_alwaysShow = alwaysShow;
}
signals:
void OpacityChanged(double value) const;

Expand Down Expand Up @@ -154,6 +157,8 @@ private Q_SLOTS:
DWindowManagerHelper *m_wmHelper;

bool m_hasComposite = false;

bool m_alwaysShow = false;
};

#endif // MAINWINDOW_H
Loading