Skip to content

Commit da19461

Browse files
andrewbytecoderandrewbytecoder
committed
去除部分文件
1 parent d18e952 commit da19461

11 files changed

+70
-72
lines changed

‎src/core/flameshot.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,11 +348,11 @@ void Flameshot::exportCapture(const QPixmap& capture,
348348
}
349349

350350
if (tasks & CR::COPY) {
351-
FlameshotDaemon::copyToClipboard(capture);
351+
FireshotDaemon::copyToClipboard(capture);
352352
}
353353

354354
if (tasks & CR::PIN) {
355-
FlameshotDaemon::createPin(capture, selection);
355+
FireshotDaemon::createPin(capture, selection);
356356
if (mode == CR::SCREEN_MODE || mode == CR::FULLSCREEN_MODE) {
357357
AbstractLogger::info()
358358
<< QObject::tr("Full screen screenshot pinned to screen");
@@ -376,7 +376,7 @@ void Flameshot::exportCapture(const QPixmap& capture,
376376
widget, &ImgUploaderBase::uploadOk, [=](const QUrl& url) {
377377
if (ConfigHandler().copyURLAfterUpload()) {
378378
if (!(tasks & CR::COPY)) {
379-
FlameshotDaemon::copyToClipboard(
379+
FireshotDaemon::copyToClipboard(
380380
url.toString(), tr("URL copied to clipboard."));
381381
}
382382
widget->showPostUploadDialog();

‎src/core/flameshotdaemon.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* @note The daemon will be automatically launched where necessary, via D-Bus.
4747
* This applies only to Linux.
4848
*/
49-
FlameshotDaemon::FlameshotDaemon()
49+
FireshotDaemon::FireshotDaemon()
5050
: m_persist(false)
5151
, m_hostingClipboard(false)
5252
, m_clipboardSignalBlocked(false)
@@ -77,17 +77,17 @@ FlameshotDaemon::FlameshotDaemon()
7777

7878
}
7979

80-
void FlameshotDaemon::start()
80+
void FireshotDaemon::start()
8181
{
8282
if (!m_instance) {
83-
m_instance = new FlameshotDaemon();
84-
// Tray icon needs FlameshotDaemon::instance() to be non-null
83+
m_instance = new FireshotDaemon();
84+
// Tray icon needs FireshotDaemon::instance() to be non-null
8585
m_instance->initTrayIcon();
8686
qApp->setQuitOnLastWindowClosed(false);
8787
}
8888
}
8989

90-
void FlameshotDaemon::createPin(const QPixmap& capture, QRect geometry)
90+
void FireshotDaemon::createPin(const QPixmap& capture, QRect geometry)
9191
{
9292
if (instance()) {
9393
instance()->attachPin(capture, geometry);
@@ -96,7 +96,7 @@ void FlameshotDaemon::createPin(const QPixmap& capture, QRect geometry)
9696

9797
}
9898

99-
void FlameshotDaemon::copyToClipboard(const QPixmap& capture)
99+
void FireshotDaemon::copyToClipboard(const QPixmap& capture)
100100
{
101101
if (instance()) {
102102
instance()->attachScreenshotToClipboard(capture);
@@ -105,8 +105,8 @@ void FlameshotDaemon::copyToClipboard(const QPixmap& capture)
105105

106106
}
107107

108-
void FlameshotDaemon::copyToClipboard(const QString& text,
109-
const QString& notification)
108+
void FireshotDaemon::copyToClipboard(const QString& text,
109+
const QString& notification)
110110
{
111111
if (instance()) {
112112
instance()->attachTextToClipboard(text, notification);
@@ -117,14 +117,14 @@ void FlameshotDaemon::copyToClipboard(const QString& text,
117117
/**
118118
* @brief Is this instance of flameshot hosting any windows as a daemon?
119119
*/
120-
bool FlameshotDaemon::isThisInstanceHostingWidgets()
120+
bool FireshotDaemon::isThisInstanceHostingWidgets()
121121
{
122122
return instance() && !instance()->m_widgets.isEmpty();
123123
}
124124

125-
void FlameshotDaemon::sendTrayNotification(const QString& text,
126-
const QString& title,
127-
const int timeout)
125+
void FireshotDaemon::sendTrayNotification(const QString& text,
126+
const QString& title,
127+
const int timeout)
128128
{
129129
if (m_trayIcon) {
130130
m_trayIcon->showMessage(
@@ -136,15 +136,15 @@ void FlameshotDaemon::sendTrayNotification(const QString& text,
136136
* @brief Return the daemon instance.
137137
*
138138
* If this instance of flameshot is the daemon, a singleton instance of
139-
* `FlameshotDaemon` is returned. As a side effect`start` will called if it
139+
* `FireshotDaemon` is returned. As a side effect`start` will called if it
140140
* wasn't called earlier. If this instance of flameshot is not the daemon,
141141
* `nullptr` is returned.
142142
*
143143
* This strategy is used because the daemon needs to receive signals from D-Bus,
144144
* for which an instance of a `QObject` is required. The singleton serves as
145145
* that object.
146146
*/
147-
FlameshotDaemon* FlameshotDaemon::instance()
147+
FireshotDaemon* FireshotDaemon::instance()
148148
{
149149
// Because we don't use DBus on MacOS, each instance of flameshot is its own
150150
// mini-daemon, responsible for hosting its own persistent widgets (e.g.
@@ -156,7 +156,7 @@ FlameshotDaemon* FlameshotDaemon::instance()
156156
* @brief Quit the daemon if it has nothing to do and the 'persist' flag is not
157157
* set.
158158
*/
159-
void FlameshotDaemon::quitIfIdle()
159+
void FireshotDaemon::quitIfIdle()
160160
{
161161
if (m_persist) {
162162
return;
@@ -168,7 +168,7 @@ void FlameshotDaemon::quitIfIdle()
168168

169169
// SERVICE METHODS
170170

171-
void FlameshotDaemon::attachPin(const QPixmap& pixmap, QRect geometry)
171+
void FireshotDaemon::attachPin(const QPixmap& pixmap, QRect geometry)
172172
{
173173
auto* pinWidget = new PinWidget(pixmap, geometry);
174174
m_widgets.append(pinWidget);
@@ -181,7 +181,7 @@ void FlameshotDaemon::attachPin(const QPixmap& pixmap, QRect geometry)
181181
pinWidget->activateWindow();
182182
}
183183

184-
void FlameshotDaemon::attachScreenshotToClipboard(const QPixmap& pixmap)
184+
void FireshotDaemon::attachScreenshotToClipboard(const QPixmap& pixmap)
185185
{
186186
m_hostingClipboard = true;
187187
QClipboard* clipboard = QApplication::clipboard();
@@ -193,8 +193,8 @@ void FlameshotDaemon::attachScreenshotToClipboard(const QPixmap& pixmap)
193193
clipboard->blockSignals(false);
194194
}
195195

196-
void FlameshotDaemon::attachTextToClipboard(const QString& text,
197-
const QString& notification)
196+
void FireshotDaemon::attachTextToClipboard(const QString& text,
197+
const QString& notification)
198198
{
199199
// Must send notification before clipboard modification on linux
200200
if (!notification.isEmpty()) {
@@ -212,7 +212,7 @@ void FlameshotDaemon::attachTextToClipboard(const QString& text,
212212
clipboard->blockSignals(false);
213213
}
214214

215-
void FlameshotDaemon::initTrayIcon()
215+
void FireshotDaemon::initTrayIcon()
216216
{
217217
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
218218
if (!ConfigHandler().disabledTrayIcon()) {
@@ -229,7 +229,7 @@ void FlameshotDaemon::initTrayIcon()
229229
#endif
230230
}
231231

232-
void FlameshotDaemon::enableTrayIcon(bool enable)
232+
void FireshotDaemon::enableTrayIcon(bool enable)
233233
{
234234
if (enable) {
235235
if (m_trayIcon == nullptr) {
@@ -244,20 +244,20 @@ void FlameshotDaemon::enableTrayIcon(bool enable)
244244
}
245245

246246

247-
void FlameshotDaemon::checkDBusConnection(const QDBusConnection& connection)
247+
void FireshotDaemon::checkDBusConnection(const QDBusConnection& connection)
248248
{
249249
if (!connection.isConnected()) {
250250
AbstractLogger::error() << tr("Unable to connect via DBus");
251251
qApp->exit(1);
252252
}
253253
}
254254

255-
void FlameshotDaemon::call(const QDBusMessage& m)
255+
void FireshotDaemon::call(const QDBusMessage& m)
256256
{
257257
QDBusConnection sessionBus = QDBusConnection::sessionBus();
258258
checkDBusConnection(sessionBus);
259259
sessionBus.call(m);
260260
}
261261

262262
// STATIC ATTRIBUTES
263-
FlameshotDaemon* FlameshotDaemon::m_instance = nullptr;
263+
FireshotDaemon* FireshotDaemon::m_instance = nullptr;

‎src/core/flameshotdaemon.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ class QDBusConnection;
1111
class TrayIcon;
1212
class CaptureWidget;
1313

14-
class FlameshotDaemon : public QObject
14+
class FireshotDaemon : public QObject
1515
{
1616
Q_OBJECT
1717
public:
1818
static void start();
19-
static FlameshotDaemon* instance();
19+
static FireshotDaemon* instance();
2020
static void createPin(const QPixmap& capture, QRect geometry);
2121
static void copyToClipboard(const QPixmap& capture);
2222
static void copyToClipboard(const QString& text,
@@ -29,7 +29,7 @@ class FlameshotDaemon : public QObject
2929
const int timeout = 5000);
3030

3131
private:
32-
FlameshotDaemon();
32+
FireshotDaemon();
3333
void quitIfIdle();
3434
void attachPin(const QPixmap& pixmap, QRect geometry);
3535
void attachScreenshotToClipboard(const QPixmap& pixmap);
@@ -51,5 +51,5 @@ class FlameshotDaemon : public QObject
5151
TrayIcon* m_trayIcon;
5252

5353

54-
static FlameshotDaemon* m_instance;
54+
static FireshotDaemon* m_instance;
5555
};

‎src/main.cpp

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void requestCaptureAndWait(const CaptureRequest& req)
3737
flameshot->requestCapture(req);
3838
QObject::connect(flameshot, &Flameshot::captureTaken, [&](const QPixmap&) {
3939
// if this instance is not daemon, make sure it exit after caputre finish
40-
if (FlameshotDaemon::instance() == nullptr && !Flameshot::instance()->haveExternalWidget()) {
40+
if (FireshotDaemon::instance() == nullptr && !Flameshot::instance()->haveExternalWidget()) {
4141
qApp->exit(0);
4242
}
4343
});
@@ -62,37 +62,35 @@ int main(int argc, char* argv[])
6262
QCoreApplication::setApplicationName(QStringLiteral("flameshot"));
6363
QCoreApplication::setOrganizationName(QStringLiteral("flameshot"));
6464

65-
66-
SingleApplication app(argc, argv);
65+
SingleApplication app(argc, argv);
6766

68-
QApplication::setStyle(new StyleOverride);
67+
QApplication::setStyle(new StyleOverride);
6968

70-
QTranslator translator, qtTranslator;
71-
QStringList trPaths = PathInfo::translationsPaths();
69+
QTranslator translator, qtTranslator;
70+
QStringList trPaths = PathInfo::translationsPaths();
7271

73-
for (const QString& path : trPaths) {
74-
bool match = translator.load(QLocale(),
75-
QStringLiteral("Internationalization"),
76-
QStringLiteral("_"),
77-
path);
78-
if (match) {
79-
break;
80-
}
72+
for (const QString& path : trPaths) {
73+
bool match = translator.load(QLocale(),
74+
QStringLiteral("Internationalization"),
75+
QStringLiteral("_"),
76+
path);
77+
if (match) {
78+
break;
8179
}
80+
}
8281

83-
qtTranslator.load(
84-
QLocale::system(),
85-
"qt",
86-
"_",
87-
QLibraryInfo::location(QLibraryInfo::TranslationsPath));
88-
89-
qApp->installTranslator(&translator);
90-
qApp->installTranslator(&qtTranslator);
91-
qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
82+
qtTranslator.load(
83+
QLocale::system(),
84+
"qt",
85+
"_",
86+
QLibraryInfo::location(QLibraryInfo::TranslationsPath));
87+
qApp->installTranslator(&translator);
88+
qApp->installTranslator(&qtTranslator);
9289

93-
auto c = Flameshot::instance();
94-
FlameshotDaemon::start();
90+
qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
9591

92+
Flameshot::instance();
93+
FireshotDaemon::start();
9694

97-
return qApp->exec();
95+
return qApp->exec();
9896
}

‎src/tools/imgupload/storages/imguploaderbase.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ void ImgUploaderBase::openURL()
165165

166166
void ImgUploaderBase::copyURL()
167167
{
168-
FlameshotDaemon::copyToClipboard(m_imageURL.toString());
168+
FireshotDaemon::copyToClipboard(m_imageURL.toString());
169169
m_notification->showMessage(tr("URL copied to clipboard."));
170170
}
171171

172172
void ImgUploaderBase::copyImage()
173173
{
174-
FlameshotDaemon::copyToClipboard(m_pixmap);
174+
FireshotDaemon::copyToClipboard(m_pixmap);
175175
m_notification->showMessage(tr("Screenshot copied to clipboard."));
176176
}
177177

‎src/utils/screenshotsaver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ bool saveToFilesystemGUI(const QPixmap& capture)
201201
AbstractLogger().attachNotificationPath(savePath) << msg;
202202

203203
if (config.copyPathAfterSave()) {
204-
FlameshotDaemon::copyToClipboard(
204+
FireshotDaemon::copyToClipboard(
205205
savePath, QObject::tr("Path copied to clipboard as ") + savePath);
206206
}
207207

‎src/utils/systemnotification.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ void SystemNotification::sendMessage(const QString& text,
5454
[&]() {
5555
// The call is queued to avoid recursive static initialization of
5656
// Flameshot and ConfigHandler.
57-
if (FlameshotDaemon::instance())
58-
FlameshotDaemon::instance()->sendTrayNotification(
57+
if (FireshotDaemon::instance())
58+
FireshotDaemon::instance()->sendTrayNotification(
5959
text, title, timeout);
6060
},
6161
Qt::QueuedConnection);

‎src/widgets/infowindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ QString generateKernelString()
5252

5353
void InfoWindow::on_CopyInfoButton_clicked()
5454
{
55-
FlameshotDaemon::copyToClipboard(GlobalValues::versionInfo() + "\n" +
55+
FireshotDaemon::copyToClipboard(GlobalValues::versionInfo() + "\n" +
5656
generateKernelString());
5757
}

‎src/widgets/trayicon.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ TrayIcon::TrayIcon(QObject* parent)
1616
{
1717
initMenu();
1818

19-
setToolTip(QStringLiteral("Flameshot"));
19+
setToolTip(QStringLiteral("FireShot"));
2020

2121
setContextMenu(m_menu);
2222
QIcon icon =
@@ -65,10 +65,10 @@ void TrayIcon::initMenu()
6565

6666
auto* captureAction = new QAction(tr("&Take Screenshot"), this);
6767
connect(captureAction, &QAction::triggered, this, [this]() {
68-
// Wait 400 ms to hide the QMenu
69-
QTimer::singleShot(400, this, [this]() {
70-
startGuiCapture();
71-
});
68+
// Wait 400 ms to hide the QMenu
69+
QTimer::singleShot(400, this, [this]() {
70+
startGuiCapture();
71+
});
7272
});
7373
auto* launcherAction = new QAction(tr("&Open Launcher"), this);
7474
connect(launcherAction,
@@ -111,6 +111,6 @@ void TrayIcon::initMenu()
111111

112112
void TrayIcon::startGuiCapture()
113113
{
114-
auto* widget = Flameshot::instance()->gui();
114+
Flameshot::instance()->gui();
115115

116116
}

‎src/widgets/trayicon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class TrayIcon : public QSystemTrayIcon
1515
private:
1616
void initMenu();
1717

18-
void startGuiCapture();
18+
static void startGuiCapture();
1919

2020
QMenu* m_menu;
2121
};

‎src/widgets/uploadlineitem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ UploadLineItem::UploadLineItem(QWidget* parent,
3535
ui->uploadTimestamp->setText(timestamp);
3636

3737
connect(ui->copyUrl, &QPushButton::clicked, this, [=]() {
38-
FlameshotDaemon::copyToClipboard(url);
38+
FireshotDaemon::copyToClipboard(url);
3939
});
4040

4141
connect(ui->openBrowser, &QPushButton::clicked, this, [=]() {
@@ -66,4 +66,4 @@ UploadLineItem::UploadLineItem(QWidget* parent,
6666
UploadLineItem::~UploadLineItem()
6767
{
6868
delete ui;
69-
}
69+
}

0 commit comments

Comments
 (0)