ScreenGrab is a crossplatform application designed to quickly get screenshots.
ScreenGrab is based on the Qt Framework, which allows the program to be used in
-Microsoft Windows and GNU/Linux environments.
+GNU/Linux and Microsoft Windows environments.
Main features:
-
Supports Windows & Linux
+
Supports Linux & Windows
Get desktop screenshots
Get active window screenshots
Get screenshots of selected desktop areas
Copy screenshots into the clipboard
-
Save your image files in PNG, JPEG or BMP format
+
Save your image files in PNG or JPEG format
Ability to view and edit screenshots in an external editor
Ability to upload screenshots to MediaCrush and imgur
Ability to set delay before getting screenshots
@@ -84,7 +84,7 @@ All management of the program can be carried out through the buttons in the main
Quit [Ctrl+Q] -- Exit ScreenGrab
- These buttons can be accessed via right-click on the ScreenGrab icon in the systemtray menu as well.
+ These buttons can be accessed via right-click on the ScreenGrab icon in the system tray menu as well.
Additional controls, located in main window.
@@ -101,7 +101,7 @@ or active window].
Default directory -- Default directory to save screenshots
Default filename -- Default name of the saved file
Format -- Default saving image format (you can select other formats)
-
No window decoration -- Grab a screenshot of the active window without window decorations (only for linux version).
+
No window decoration -- Grab a screenshot of the active window without window decorations (only for Linux version).
Advanced settings:
@@ -178,12 +178,12 @@ when exiting ScreenGrab (and restore it at next run)
Tray messages -- Mode of displaying tray messages on grab|save events. Can be "none"
or "if hidden" or "always"
Time to display tray messages -- Time within a specific notification is displayed
-
Close in tray -- Minimize the main window into the systemtray
+
Close in tray -- Minimize the main window into the system tray
by click on the close window button.
- Shortcut Settings:
+ Shortcut Settings:
On the tab "Shortcuts" in the options window you can set the keyboard shortcuts, which allows you to access the application functions easily. There are two kinds of key combinations used in ScreenGrab - local and global.
@@ -195,7 +195,7 @@ by click on the close window button.
Global shortcuts can be used the get a new screenshot when you have opened other application windows.
- Command line parameters:
+ Command line parameters:
--fullscreen -- Set the fullscreen mode [default].
@@ -231,8 +231,8 @@ by click on the close window button.
Translators:
-
Marcio Moraes -- Brazilian Portuguese translation
-
Gennadi Motsyo -- Ukrainian translation
+
Marcio Moraes -- Brazilian Portuguese translation
+
Gennadi Motsyo -- Ukrainian translation
Beta-testers:
@@ -249,7 +249,7 @@ And all those who use ScreenGrab :)
Added ability for autosaving type of the last created screenshot.
Some small fixes.
@@ -415,9 +415,9 @@ And all those who use ScreenGrab :)
added saving options into INI-file
added i18n support and Russian localisation
some fixes and changes in code
-
now available as installer (Windows) and deb packages (ubuntu 9.04)
+
now available as installer (Windows) and deb packages (Ubuntu 9.04)
-
x
+
Version 0.1:
diff --git a/docs/html/pt_BR/index.html b/docs/html/pt_BR/index.html
index 00d72a9..ec4d014 100644
--- a/docs/html/pt_BR/index.html
+++ b/docs/html/pt_BR/index.html
@@ -38,8 +38,7 @@ Microsoft Windows e GNU/Linux.
Obtém captura de tela da janela ativa
Obtém captura de tela de uma região do desktop
Copia a captura de tela para a área de transferência
-
Salva seus arquivos de imagens no formato PNG
-ou JPEG ou BMP
+
Salva seus arquivos de imagens no formato PNG ou JPEG
Ability to view and edit screenshots in an external editor
Ability to upload screenshots on several image hostings (mediacru.sh, imgur.com)
Habilidade em definir atraso ao obter as capturas de telas
@@ -242,7 +241,7 @@ E a todos aqueles que utilizam ScreenGrab :)
Added ability for autosaving type of the last created screenshot.
Some small fixes.
diff --git a/screengrab_de.qm b/screengrab_de.qm
new file mode 100644
index 0000000..165f4ac
Binary files /dev/null and b/screengrab_de.qm differ
diff --git a/screengrab_es_ES.qm b/screengrab_es_ES.qm
new file mode 100644
index 0000000..ebf0e2a
Binary files /dev/null and b/screengrab_es_ES.qm differ
diff --git a/screengrab_it.qm b/screengrab_it.qm
new file mode 100644
index 0000000..fa1ff54
Binary files /dev/null and b/screengrab_it.qm differ
diff --git a/screengrab_pt_BR.qm b/screengrab_pt_BR.qm
new file mode 100644
index 0000000..7302c8a
Binary files /dev/null and b/screengrab_pt_BR.qm differ
diff --git a/screengrab_ru.qm b/screengrab_ru.qm
new file mode 100644
index 0000000..596099b
Binary files /dev/null and b/screengrab_ru.qm differ
diff --git a/screengrab_uk_UA.qm b/screengrab_uk_UA.qm
new file mode 100644
index 0000000..73b5d0d
Binary files /dev/null and b/screengrab_uk_UA.qm differ
diff --git a/src/core/config.cpp b/src/core/config.cpp
index e35e9c1..b879ecc 100644
--- a/src/core/config.cpp
+++ b/src/core/config.cpp
@@ -130,7 +130,6 @@ Config::Config()
saveSettings();
}
- _imageFormats << "png" << "jpg" << "bmp";
_settings->setIniCodec("UTF-8");
_scrNum = 0;
}
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 2cee298..4795b90 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -240,14 +240,6 @@ void Core::checkAutoSave(bool first)
else
autoSave();
}
- else
- {
- if (!first)
- {
- StateNotifyMessage message(tr("New screen"), tr("New screen is getted!"));
- sendNotify(message);
- }
- }
}
void Core::getActiveWindow()
diff --git a/src/core/ui/about.cpp b/src/core/ui/about.cpp
index 33f2b15..6c47467 100644
--- a/src/core/ui/about.cpp
+++ b/src/core/ui/about.cpp
@@ -31,16 +31,8 @@ AboutDialog::AboutDialog(QWidget *parent):
_ui->setupUi(this);
_ui->labAppName->setText(_ui->labAppName->text() + QString(" ") + qApp->applicationVersion() + QString(""));
- QString versionInfo;
- versionInfo = tr("built on ");
- versionInfo.append(__DATE__);
- versionInfo.append(" ");
- versionInfo.append(__TIME__);
-
_ui->labQtVer->setText(tr("using Qt ") + qVersion());
- _ui->labVersion->setText(versionInfo);
-
QTabBar *tabs = new QTabBar;
_ui->frame->layout()->addWidget(tabs);
diff --git a/src/core/ui/configwidget.cpp b/src/core/ui/configwidget.cpp
index 3662440..8b5a237 100644
--- a/src/core/ui/configwidget.cpp
+++ b/src/core/ui/configwidget.cpp
@@ -150,7 +150,6 @@ void ConfigDialog::loadSettings()
_ui->cbxFormat->addItem("png");
_ui->cbxFormat->addItem("jpg");
- _ui->cbxFormat->addItem("bmp");
_ui->cbxFormat->setCurrentIndex(conf->getDefaultFormatID());
_ui->defDelay->setValue(conf->getDefDelay());
diff --git a/src/core/ui/mainwindow.cpp b/src/core/ui/mainwindow.cpp
index b8442d0..8d587ce 100644
--- a/src/core/ui/mainwindow.cpp
+++ b/src/core/ui/mainwindow.cpp
@@ -497,7 +497,6 @@ void MainWindow::saveScreen()
formatsAvalible["png"] = tr("PNG Files");
formatsAvalible["jpg"] = tr("JPEG Files");
- formatsAvalible["bmp"] = tr("BMP Files");
QString format = "png";
_conf->getSaveFormat();
diff --git a/src/modules/uploader/CMakeLists.txt b/src/modules/uploader/CMakeLists.txt
index fbd6b7f..8e2ef79 100644
--- a/src/modules/uploader/CMakeLists.txt
+++ b/src/modules/uploader/CMakeLists.txt
@@ -7,9 +7,6 @@ set(uploader_SRC
uploaderconfigwidget.cpp
imgur/uploader_imgur_widget.cpp
imgur/uploaderconfigwidget_imgur.cpp
- mediacrush/uploader_mediacrush.cpp
- mediacrush/uploader_mediacrush_widget.cpp
- mediacrush/uploaderconfigwidget_mediacrush.cpp
)
set(uploader_UI
@@ -17,8 +14,6 @@ set(uploader_UI
uploaderconfigwidget.ui
imgur/uploader_imgur_widget.ui
imgur/uploaderconfigwidget_imgur.ui
- mediacrush/uploader_mediacrush_widget.ui
- mediacrush/uploaderconfigwidget_mediacrush.ui
)
lxqt_translate_ts(uploader_QMS
diff --git a/src/modules/uploader/dialoguploader.cpp b/src/modules/uploader/dialoguploader.cpp
index ccf84c1..6d1131c 100644
--- a/src/modules/uploader/dialoguploader.cpp
+++ b/src/modules/uploader/dialoguploader.cpp
@@ -22,8 +22,6 @@
#include "uploaderconfig.h"
#include "imgur/uploader_imgur.h"
#include "imgur/uploader_imgur_widget.h"
-#include "mediacrush/uploader_mediacrush.h"
-#include "mediacrush/uploader_mediacrush_widget.h"
#include
#include
@@ -113,9 +111,6 @@ void DialogUploader::slotUploadStart()
switch(_selectedHost)
{
case 0:
- _uploader = new Uploader_MediaCrush(Core::instance()->config()->getSaveFormat());
- break;
- case 1:
_uploader = new Uploader_ImgUr;
break;
default:
@@ -148,13 +143,10 @@ void DialogUploader::slotSeletHost(int type)
switch(_selectedHost)
{
case 0:
- _uploaderWidget = new Uploader_MediaCrush_Widget();
- break;
- case 1:
_uploaderWidget = new Uploader_ImgUr_Widget();
break;
default:
- _uploaderWidget = new Uploader_MediaCrush_Widget();
+ _uploaderWidget = new Uploader_ImgUr_Widget();
}
_ui->stackedWidget->addWidget(_uploaderWidget);
diff --git a/src/modules/uploader/imgur/uploader_imgur_widget.ui b/src/modules/uploader/imgur/uploader_imgur_widget.ui
index b002ada..edaad41 100644
--- a/src/modules/uploader/imgur/uploader_imgur_widget.ui
+++ b/src/modules/uploader/imgur/uploader_imgur_widget.ui
@@ -17,7 +17,7 @@
- Upload to ImgUr.com
+ Upload to ImgurQt::AlignCenter
diff --git a/src/modules/uploader/imgur/uploaderconfigwidget_imgur.ui b/src/modules/uploader/imgur/uploaderconfigwidget_imgur.ui
index 90ceca9..1f27761 100644
--- a/src/modules/uploader/imgur/uploaderconfigwidget_imgur.ui
+++ b/src/modules/uploader/imgur/uploaderconfigwidget_imgur.ui
@@ -40,7 +40,7 @@
- Now is nothing yet
+ No settings available right nowQt::AlignCenter
diff --git a/src/modules/uploader/mediacrush/uploader_mediacrush.cpp b/src/modules/uploader/mediacrush/uploader_mediacrush.cpp
deleted file mode 100644
index c56a701..0000000
--- a/src/modules/uploader/mediacrush/uploader_mediacrush.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2009 - 2013 by Artem 'DOOMer' Galichkin *
- * doomer3d@gmail.com *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- ***************************************************************************/
-
-#include "uploader_mediacrush.h"
-
-#include
-#include
-#include
-
-#include "uploaderconfig.h"
-
-#include
-
-Uploader_MediaCrush::Uploader_MediaCrush(const QString& format, QObject* parent): Uploader(parent)
-{
- _host = "mediacru.sh";
- qDebug() << " create MediaCrush uploader";
- UpdateUploadedStrList();
- setCurrentFormat(format);
-}
-
-Uploader_MediaCrush::~Uploader_MediaCrush()
-{
- qDebug() << " kill MediaCrush uploader";
-}
-
-/*!
- * Start upload process
- */
-void Uploader_MediaCrush::startUploading()
-{
- createData();
- createRequest(imageData, apiUrl());
-
- _request.setRawHeader("Host", _host);
- Uploader::startUploading();
-}
-
-/*!
- * Set type of uploading image, for generate right direct link on it.
- */
-void Uploader_MediaCrush::setCurrentFormat(const QString& format)
-{
- _currentFormat = format.toLatin1();
-}
-
-/*!
- * Return url for upload image
- */
-QUrl Uploader_MediaCrush::apiUrl()
-{
- UploaderConfig config;
- // QUrl("https://mediacru.sh/api/upload/file")
-
- return config.loadSingleParam("mediacru.sh", KEY_MCSH_URL).toUrl();
-}
-
-/*!
- * Prepare image data for uploading
- */
-void Uploader_MediaCrush::createData(bool inBase64)
-{
- Uploader::createData(inBase64);
-
- _multipartData = new QHttpMultiPart(QHttpMultiPart::FormDataType);
-
- QHttpPart imagePart;
- if (_formatString == "jpg")
- {
- imagePart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
- }
- else
- {
- imagePart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/" + _formatString));
- }
- QByteArray disposition = "form-data; name=\"file\"; filename='"+ _uploadFilename.toLatin1() +"'";
- imagePart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant(disposition));
- imagePart.setBody(imageData);
-
- _multipartData->append(imagePart);
-
- imageData.clear();
-}
-
-/*!
- * Process server reply data
- */
-void Uploader_MediaCrush::replyFinished(QNetworkReply* reply)
-{
- if (reply->error() == QNetworkReply::NoError)
- {
- QByteArray response = reply->readAll();
-
- if (response.split(':').count() >= 2)
- {
- response = response.split(':').at(1);
- response = response.mid(2, 12);
- }
-
- _uploadedStrings[UL_DIRECT_LINK].first = "https://" + _host + "/" + response + "." + _currentFormat;
- _uploadedStrings[UL_DELETE_URL].first = "https://" + _host + "/" + response + "/delete";
-
- Q_EMIT uploadDoneStr(_uploadedStrings[UL_DIRECT_LINK].first);
- Q_EMIT uploadDone();
- }
- else
- {
- Q_EMIT uploadFail(reply->errorString().toLatin1());
- }
-
- reply->deleteLater();
-}
-
-void Uploader_MediaCrush::UpdateUploadedStrList()
-{
- QStringList nonUsed = QStringList() << UL_BB_CODE << UL_BB_CODE_THUMB << UL_HTML_CODE << UL_HTML_CODE_THUMB;
-
- for (int i =0; i < nonUsed.count(); ++i)
- {
- _uploadedStrings.remove(nonUsed.at(i).toLatin1());
- }
-}
diff --git a/src/modules/uploader/mediacrush/uploader_mediacrush.h b/src/modules/uploader/mediacrush/uploader_mediacrush.h
deleted file mode 100644
index 3f15c51..0000000
--- a/src/modules/uploader/mediacrush/uploader_mediacrush.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2009 - 2013 by Artem 'DOOMer' Galichkin *
- * doomer3d@gmail.com *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- ***************************************************************************/
-
-#ifndef UPLOADER_MEDIACRUSH_H
-#define UPLOADER_MEDIACRUSH_H
-
-#include
-
-#include
-
-class Uploader_MediaCrush : public Uploader
-{
- Q_OBJECT
-public:
- explicit Uploader_MediaCrush(const QString& format, QObject* parent = 0);
- virtual ~Uploader_MediaCrush();
-
- virtual void startUploading();
-
-protected:
- virtual QUrl apiUrl();
- virtual void createData(bool inBase64 = false);
-
-protected Q_SLOTS:
- virtual void replyFinished(QNetworkReply* reply);
-
-private:
- void setCurrentFormat(const QString& format);
-
- QByteArray _host;
- QByteArray _currentFormat;
- void UpdateUploadedStrList();
-};
-
-#endif // UPLOADER_MEDIACRUSH_H
-
diff --git a/src/modules/uploader/mediacrush/uploader_mediacrush_widget.cpp b/src/modules/uploader/mediacrush/uploader_mediacrush_widget.cpp
deleted file mode 100644
index 20de3bc..0000000
--- a/src/modules/uploader/mediacrush/uploader_mediacrush_widget.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2009 - 2013 by Artem 'DOOMer' Galichkin *
- * doomer3d@gmail.com *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- ***************************************************************************/
-
-#include "uploader_mediacrush_widget.h"
-#include "ui_uploader_mediacrush_widget.h"
-
-Uploader_MediaCrush_Widget::Uploader_MediaCrush_Widget(QWidget *parent) :
- QWidget(parent),
- ui(new Ui::Uploader_MediaCrush_Widget)
-{
- ui->setupUi(this);
-}
-
-Uploader_MediaCrush_Widget::~Uploader_MediaCrush_Widget()
-{
- delete ui;
-}
diff --git a/src/modules/uploader/mediacrush/uploader_mediacrush_widget.h b/src/modules/uploader/mediacrush/uploader_mediacrush_widget.h
deleted file mode 100644
index 6b8397b..0000000
--- a/src/modules/uploader/mediacrush/uploader_mediacrush_widget.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2009 - 2013 by Artem 'DOOMer' Galichkin *
- * doomer3d@gmail.com *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- ***************************************************************************/
-
-#ifndef UPLOADER_MEDIACRUSH_WIDGET_H
-#define UPLOADER_MEDIACRUSH_WIDGET_H
-
-#include
-
-namespace Ui {
-class Uploader_MediaCrush_Widget;
-}
-
-class Uploader_MediaCrush_Widget : public QWidget
-{
- Q_OBJECT
-
-public:
- explicit Uploader_MediaCrush_Widget(QWidget *parent = 0);
- ~Uploader_MediaCrush_Widget();
-
-private:
- Ui::Uploader_MediaCrush_Widget *ui;
-};
-
-#endif // UPLOADER_MEDIACRUSH_WIDGET_H
diff --git a/src/modules/uploader/mediacrush/uploader_mediacrush_widget.ui b/src/modules/uploader/mediacrush/uploader_mediacrush_widget.ui
deleted file mode 100644
index 68767fe..0000000
--- a/src/modules/uploader/mediacrush/uploader_mediacrush_widget.ui
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
- Uploader_MediaCrush_Widget
-
-
-
- 0
- 0
- 417
- 203
-
-
-
- Form
-
-
-
-
-
- Upload to MediaCrush
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- Qt::Vertical
-
-
-
- 20
- 168
-
-
-
-
-
-
-
-
-
diff --git a/src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.cpp b/src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.cpp
deleted file mode 100644
index 0dcdf89..0000000
--- a/src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2009 - 2013 by Artem 'DOOMer' Galichkin *
- * doomer3d@gmail.com *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- ***************************************************************************/
-
-#include "uploaderconfigwidget_mediacrush.h"
-#include "ui_uploaderconfigwidget_mediacrush.h"
-
-#include "uploaderconfig.h"
-
-#include
-
-UploaderConfigWidget_MediaCrush::UploaderConfigWidget_MediaCrush(QWidget *parent) :
- QWidget(parent),
- ui(new Ui::UploaderConfigWidget_MediaCrush)
-{
- ui->setupUi(this);
-
- // load settings
- UploaderConfig config;
-
- QVariantMap loadedValues;
- loadedValues.insert(KEY_MCSH_URL, "");
-
- loadedValues = config.loadSettings("mediacru.sh", loadedValues);
- ui->editUrl->setText(loadedValues[KEY_MCSH_URL].toString());
-
-}
-
-UploaderConfigWidget_MediaCrush::~UploaderConfigWidget_MediaCrush()
-{
- delete ui;
-}
-
-void UploaderConfigWidget_MediaCrush::saveSettings()
-{
- UploaderConfig config;
-
- QVariantMap savingValues;
- savingValues.insert(KEY_MCSH_URL, ui->editUrl->text());
-
- config.saveSettings("mediacru.sh", savingValues);
-}
diff --git a/src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.h b/src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.h
deleted file mode 100644
index 533e6a8..0000000
--- a/src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2009 - 2013 by Artem 'DOOMer' Galichkin *
- * doomer3d@gmail.com *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- ***************************************************************************/
-
-#ifndef UPLOADERCONFIGWIDGET_MEDIACRUSH_H
-#define UPLOADERCONFIGWIDGET_MEDIACRUSH_H
-
-#include
-
-namespace Ui {
-class UploaderConfigWidget_MediaCrush;
-}
-
-class UploaderConfigWidget_MediaCrush : public QWidget
-{
- Q_OBJECT
-
-public:
- explicit UploaderConfigWidget_MediaCrush(QWidget *parent = 0);
- ~UploaderConfigWidget_MediaCrush();
-
-public Q_SLOTS:
- void saveSettings();
-
-private:
- Ui::UploaderConfigWidget_MediaCrush *ui;
-};
-
-#endif // UPLOADERCONFIGWIDGET_MEDIACRUSH_H
diff --git a/src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.ui b/src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.ui
deleted file mode 100644
index 2685a18..0000000
--- a/src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.ui
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
- UploaderConfigWidget_MediaCrush
-
-
-
- 0
- 0
- 320
- 240
-
-
-
- Form
-
-
-
-
-
- Configuration for mediacru.sh upload
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- Qt::Vertical
-
-
- QSizePolicy::Minimum
-
-
-
- 20
- 10
-
-
-
-
-
-
-
- URL forupload
-
-
- Qt::AlignCenter
-
-
-
-
-
-
-
-
-
- Central server MediaCrush is down, but you can set up self-hosted instance. And add here url to it.
-
-
-
-
-
-
- e.g. "https://mediacru.sh/api/upload/file"
-
-
-
-
-
-
- Qt::Vertical
-
-
-
- 20
- 87
-
-
-
-
-
-
-
-
-
diff --git a/src/modules/uploader/moduleuploader.cpp b/src/modules/uploader/moduleuploader.cpp
index 344fe72..39df1a8 100644
--- a/src/modules/uploader/moduleuploader.cpp
+++ b/src/modules/uploader/moduleuploader.cpp
@@ -21,7 +21,6 @@
#include "uploaderconfigwidget.h"
#include "uploaderconfig.h"
#include "imgur/uploader_imgur.h"
-#include "mediacrush/uploader_mediacrush.h"
#include "core/core.h"
@@ -62,9 +61,6 @@ void ModuleUploader::init()
switch(config.labelsList().indexOf(selectedtHost))
{
case 0:
- uploader = new Uploader_MediaCrush(core->config()->getSaveFormat());
- break;
- case 1:
uploader = new Uploader_ImgUr;
break;
default:
diff --git a/src/modules/uploader/uploaderconfig.cpp b/src/modules/uploader/uploaderconfig.cpp
index 78ede10..287a806 100644
--- a/src/modules/uploader/uploaderconfig.cpp
+++ b/src/modules/uploader/uploaderconfig.cpp
@@ -28,10 +28,8 @@
#define DEF_AUTO_COPY_RESULT_LIMK false
#define DEF_DEFAULT_HOST "Imgur"
-// mediacru.sh settings
-#define DEF_MCSH_URL "https://mediacru.sh/api/upload/file"
-QStringList UploaderConfig::_labelsList = QStringList() << "Imgur" << "MediaCrush";
+QStringList UploaderConfig::_labelsList = QStringList() << "Imgur";
UploaderConfig::UploaderConfig()
{
@@ -104,11 +102,6 @@ void UploaderConfig::defaultSettings()
_settings->setValue(KEY_DEFAULT_HOST, DEF_DEFAULT_HOST);
_settings->endGroup();
- // mediacru.sh settings
- _settings->beginGroup(_groupsList[0]);
- _settings->setValue(KEY_MCSH_URL, DEF_MCSH_URL);
- _settings->endGroup();
-
// imgur.com settings
_settings->beginGroup(_groupsList[1]);
_settings->endGroup();
diff --git a/src/modules/uploader/uploaderconfig.h b/src/modules/uploader/uploaderconfig.h
index 6b0fff5..1059155 100644
--- a/src/modules/uploader/uploaderconfig.h
+++ b/src/modules/uploader/uploaderconfig.h
@@ -28,9 +28,6 @@
#define KEY_AUTO_COPY_RESULT_LIMK "autoCopyDirectLink"
#define KEY_DEFAULT_HOST "defaultHost"
-// Uploader config file mediacru.sh keys
-#define KEY_MCSH_URL "uploadUrl"
-
class UploaderConfig
{
diff --git a/src/modules/uploader/uploaderconfigwidget.cpp b/src/modules/uploader/uploaderconfigwidget.cpp
index 0536661..62d942f 100644
--- a/src/modules/uploader/uploaderconfigwidget.cpp
+++ b/src/modules/uploader/uploaderconfigwidget.cpp
@@ -40,10 +40,8 @@ UploaderConfigWidget::UploaderConfigWidget(QWidget *parent) :
loadSettings();
- _crush = new UploaderConfigWidget_MediaCrush(this);
_imgur = new UploaderConfigWidget_ImgUr(this);
- _ui->stackedHosts->addWidget(_crush);
_ui->stackedHosts->addWidget(_imgur);
void (QComboBox::*hostChanged)(int) = &QComboBox::currentIndexChanged;
@@ -100,7 +98,6 @@ void UploaderConfigWidget::saveSettings()
config.saveSettings("common", savingValues);
QMetaObject::invokeMethod(_imgur, "saveSettings");
- QMetaObject::invokeMethod(_crush, "saveSettings");
}
void UploaderConfigWidget::changeEvent(QEvent *e)
diff --git a/src/modules/uploader/uploaderconfigwidget.h b/src/modules/uploader/uploaderconfigwidget.h
index 63eb96d..dd10f9c 100644
--- a/src/modules/uploader/uploaderconfigwidget.h
+++ b/src/modules/uploader/uploaderconfigwidget.h
@@ -22,7 +22,6 @@
#include
#include "imgur/uploaderconfigwidget_imgur.h"
-#include "mediacrush/uploaderconfigwidget_mediacrush.h"
namespace Ui {
class UploaderConfigWidget;
@@ -47,7 +46,6 @@ private:
Ui::UploaderConfigWidget *_ui;
// services widgets
- UploaderConfigWidget_MediaCrush *_crush;
UploaderConfigWidget_ImgUr *_imgur;
};
diff --git a/translations/screengrab_de_DE.ts b/translations/screengrab_de.ts
similarity index 97%
rename from translations/screengrab_de_DE.ts
rename to translations/screengrab_de.ts
index 94644f1..5e07eca 100644
--- a/translations/screengrab_de_DE.ts
+++ b/translations/screengrab_de.ts
@@ -655,21 +655,6 @@ indem Sie die <Esc>-Taste oder die mittlere Maustaste drücken.Keine Konfiguration vorhanden
-
- UploaderConfigWidget_MediaCrush
-
- Form
- Formular
-
-
- Configuration for mediacru.sh upload
- Konfiguration für <mediacru.sh>
-
-
- Now is nothing yet
- Keine Konfiguration vorhanden
-
-Uploader_ImgUr_Widget
@@ -677,17 +662,6 @@ indem Sie die <Esc>-Taste oder die mittlere Maustaste drücken.Nach <ImgUr.com> hochladen
-
- Uploader_MediaCrush_Widget
-
- Form
- Formular
-
-
- Upload to MediaCrush
- Nach <MediaCrush> hochladen
-
-aboutWidget
diff --git a/translations/screengrab_it_IT.ts b/translations/screengrab_it.ts
similarity index 100%
rename from translations/screengrab_it_IT.ts
rename to translations/screengrab_it.ts
diff --git a/translations/screengrab_ru.ts b/translations/screengrab_ru.ts
index 5471149..8112630 100644
--- a/translations/screengrab_ru.ts
+++ b/translations/screengrab_ru.ts
@@ -652,17 +652,6 @@ any key or using the right or middle mouse buttons.
Пока ничего нет
-
- UploaderConfigWidget_MediaCrush
-
- Configuration for mediacru.sh upload
- Настройка загрузки для mediacru.sh
-
-
- Now is nothing yet
- Пока ничего нет
-
-Uploader_ImgUr_Widget
@@ -670,13 +659,6 @@ any key or using the right or middle mouse buttons.
Загрузка на ImgUr.com
-
- Uploader_MediaCrush_Widget
-
- Upload to MediaCrush
- Загрузить на MediaCrush
-
-aboutWidget
diff --git a/translations/screengrab_uk_UA.ts b/translations/screengrab_uk_UA.ts
index dafafce..a6219f4 100644
--- a/translations/screengrab_uk_UA.ts
+++ b/translations/screengrab_uk_UA.ts
@@ -584,13 +584,6 @@ any key or using the right or middle mouse buttons.
Ще нічого немає
-
- UploaderConfigWidget_MediaCrush
-
- Now is nothing yet
- Ще нічого немає
-
-Uploader_ImgUr_Widget
diff --git a/translations/uploader.ts b/translations/uploader.ts
index 8b51f29..654c3f8 100644
--- a/translations/uploader.ts
+++ b/translations/uploader.ts
@@ -215,24 +215,6 @@
-
- UploaderConfigWidget_MediaCrush
-
-
- Form
-
-
-
-
- Configuration for mediacru.sh upload
-
-
-
-
- Now is nothing yet
-
-
-Uploader_ImgUr_Widget
@@ -241,17 +223,4 @@
-
- Uploader_MediaCrush_Widget
-
-
- Form
-
-
-
-
- Upload to MediaCrush
-
-
-