No OneTemporary
Actions

Authored By

Unknown

Size

136 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/dialogs/historydialog.cpp b/dialogs/historydialog.cpp
	index 37df957..66914c5 100644
	--- a/dialogs/historydialog.cpp
	+++ b/dialogs/historydialog.cpp
	@@ -1,240 +1,253 @@
	#include "historydialog.h"
	#include "ui_historydialog.h"

	#include "../tools/os.h"
	#include "../tools/qxtcsvmodel.h"
	#include "../tools/uploader.h"
	#include "../tools/screenshotmanager.h"

	#include <QClipboard>
	#include <QDesktopServices>
	#include <QDir>
	#include <QFile>
	#include <QFileInfo>
	#include <QFileSystemWatcher>
	#include <QMenu>
	#include <QMessageBox>
	#include <QSortFilterProxyModel>
	#include <QUrl>

	#include <QDebug>

	HistoryDialog::HistoryDialog(QWidget *parent) :
	QDialog(parent),
	ui(new Ui::HistoryDialog)
	{
	ui->setupUi(this);

	ui->filterEdit->setText(tr("Filter.."));
	ui->filterEdit->installEventFilter(this);

	QFile historyFile(ScreenshotManager::instance()->historyPath());

	if (!historyFile.exists())
	{
	ui->tableView->setEnabled(false);
	return;
	}

	QFileSystemWatcher *watcher = new QFileSystemWatcher(QStringList() << historyFile.fileName(), this);
	connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(reloadHistory()));

	reloadHistory();

	ui->uploadProgressBar->setValue (Uploader::instance()->progressSent());

	if (Uploader::instance()->progressTotal() == 0) {
	ui->uploadProgressBar->setMaximum(1);
	}
	else {
	ui->uploadProgressBar->setMaximum(Uploader::instance()->progressTotal());
	}

	ui->tableView->setTextElideMode(Qt::ElideLeft);
	ui->tableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
	ui->tableView->setAlternatingRowColors(true);
	ui->tableView->setSelectionMode(QAbstractItemView::SingleSelection);
	ui->tableView->setContextMenuPolicy(Qt::CustomContextMenu);
	ui->tableView->setSortingEnabled(true);

	if (ui->tableView->model()->rowCount() > 0)
	{
	ui->clearButton->setEnabled(true);
	ui->filterEdit->setEnabled(true);
	}

	connect(Uploader::instance(), SIGNAL(progress(qint64,qint64)), this, SLOT(uploadProgress(qint64, qint64)));
	connect(ui->uploadButton, SIGNAL(clicked()), this, SLOT(upload()));
	connect(ui->clearButton , SIGNAL(clicked()), this, SLOT(clear()));
	connect(ui->tableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(selectionChanged(QItemSelection,QItemSelection)));
	connect(ui->tableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(open(QModelIndex)));
	connect(ui->tableView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint)));
	}

	HistoryDialog::~HistoryDialog()
	{
	delete ui;
	}

	void HistoryDialog::clear()
	{
	if (QMessageBox::question(this,
	tr("Clearing the screenshot history"),
	tr("Are you sure you want to clear your entire screenshot history?\nThis cannot be undone."),
	tr("Clear History"),
	tr("Don't Clear")) == 1) {
	return;
	}

	QFile::remove(ScreenshotManager::instance()->historyPath());
	close();
	}

	void HistoryDialog::contextMenu(QPoint point)
	{
	mContextIndex = ui->tableView->indexAt(point);;

	QMenu contextMenu(ui->tableView);

	QAction copyAction((mContextIndex.column() == 0) ? tr("Copy Path") : tr("Copy URL"), &contextMenu);
	connect(&copyAction, SIGNAL(triggered()), this, SLOT(copy()));
	contextMenu.addAction(&copyAction);

	+ QAction deleteAction(tr("Delete from imgur.com"), &contextMenu);
	QAction locationAction(tr("Open Location"), &contextMenu);

	if (mContextIndex.column() == 0)
	{
	connect(&locationAction, SIGNAL(triggered()), this, SLOT(location()));
	contextMenu.addAction(&locationAction);
	}
	- else if (mContextIndex.data().toString() == QObject::tr("- not uploaded -")) {
	+ else {
	+ connect(&deleteAction, SIGNAL(triggered()), this, SLOT(deleteImage()));
	+ contextMenu.addAction(&deleteAction);
	+ }
	+
	+ if (mContextIndex.data().toString() == QObject::tr("- not uploaded -")) {
	copyAction.setEnabled(false);
	+ deleteAction.setEnabled(false);
	}

	contextMenu.exec(QCursor::pos());
	}

	void HistoryDialog::copy()
	{
	qApp->clipboard()->setText(mContextIndex.data().toString());
	}

	+void HistoryDialog::deleteImage()
	+{
	+ QDesktopServices::openUrl("http://imgur.com/delete/" + mContextIndex.sibling(mContextIndex.row(), 2).data().toString());
	+}
	+
	void HistoryDialog::location()
	{
	QDesktopServices::openUrl("file:///" + QFileInfo(mContextIndex.data().toString()).absolutePath());
	}

	void HistoryDialog::open(QModelIndex index)
	{
	if (index.column() == 0) {
	QDesktopServices::openUrl(QUrl("file:///" + index.data().toString()));
	}
	else {
	QDesktopServices::openUrl(index.data().toUrl());
	}
	}

	void HistoryDialog::reloadHistory()
	{
	if (ui->tableView->model()) {
	// Double cast all the way across the sky!
	QxtCsvModel* csv = qobject_cast<QxtCsvModel>(qobject_cast<QSortFilterProxyModel>(ui->tableView->model())->sourceModel());
	csv->setSource(ScreenshotManager::instance()->historyPath(), false, '\|');
	return;
	}

	QFile historyFile(ScreenshotManager::instance()->historyPath());

	QxtCsvModel *model = new QxtCsvModel(&historyFile, this, false, '\|');
	model->setHeaderData(QStringList() << tr("Screenshot") << tr("URL"));

	mFilterModel = new QSortFilterProxyModel(model);
	mFilterModel->setSourceModel(model);
	mFilterModel->setDynamicSortFilter(true);
	mFilterModel->setSortCaseSensitivity(Qt::CaseInsensitive);
	mFilterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
	mFilterModel->setFilterKeyColumn(-1);

	ui->tableView->setModel(mFilterModel);

	- ui->tableView->hideColumn(2); // No timestamp.
	+ ui->tableView->hideColumn(2); // No delete hash.
	+ ui->tableView->hideColumn(3); // No timestamp.

	ui->tableView->horizontalHeader()->setClickable(false);
	ui->tableView->horizontalHeader()->setMovable(false);

	ui->tableView->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
	ui->tableView->horizontalHeader()->setResizeMode(1, QHeaderView::ResizeToContents);

	ui->tableView->verticalHeader()->hide();
	}

	void HistoryDialog::selectionChanged(QItemSelection selected, QItemSelection deselected)
	{
	Q_UNUSED(deselected);

	QModelIndex index = selected.indexes().at(0);

	QString screenshot, url;

	if (index.column() == 0) {
	screenshot = index.data().toString();
	url = ui->tableView->model()->index(index.row(), 1).data().toString();
	}
	else {
	screenshot = ui->tableView->model()->index(index.row(), 0).data().toString();
	url = index.data().toString();
	}

	mSelectedScreenshot = screenshot;

	ui->uploadButton->setEnabled((url == QObject::tr("- not uploaded -") && QFile::exists(screenshot)));
	}

	void HistoryDialog::upload()
	{
	Uploader::instance()->upload(mSelectedScreenshot);
	ui->uploadButton->setEnabled(false);
	}

	void HistoryDialog::uploadProgress(qint64 sent, qint64 total)
	{
	ui->uploadProgressBar->setEnabled(true);

	ui->uploadProgressBar->setMaximum(total);
	ui->uploadProgressBar->setValue(sent);
	}

	bool HistoryDialog::eventFilter(QObject object, QEvent event)
	{
	if (object == ui->filterEdit) {
	if (event->type() == QEvent::FocusIn)
	{
	if (ui->filterEdit->text() == tr("Filter..")) {
	ui->filterEdit->setStyleSheet("");
	ui->filterEdit->setText("");
	mFilterModel->setFilterWildcard("");
	- mFilterModel->sort(2, Qt::DescendingOrder);
	+ mFilterModel->sort(3, Qt::DescendingOrder);
	}
	}
	else if (event->type() == QEvent::FocusOut)
	{
	if (ui->filterEdit->text() == "") {
	ui->filterEdit->setStyleSheet("color: palette(mid);");
	ui->filterEdit->setText(tr("Filter.."));
	- mFilterModel->sort(2, Qt::DescendingOrder);
	+ mFilterModel->sort(3, Qt::DescendingOrder);
	}
	}
	else if (event->type() == QEvent::KeyRelease)
	{
	if (ui->filterEdit->text() != tr("Filter..") && !ui->filterEdit->text().isEmpty()) {
	mFilterModel->setFilterWildcard(ui->filterEdit->text());
	- mFilterModel->sort(2, Qt::DescendingOrder);
	+ mFilterModel->sort(3, Qt::DescendingOrder);
	}
	else {
	mFilterModel->setFilterWildcard("");
	- mFilterModel->sort(2, Qt::DescendingOrder);
	+ mFilterModel->sort(3, Qt::DescendingOrder);
	}
	}
	}
	return QDialog::eventFilter(object, event);
	}
	diff --git a/dialogs/historydialog.h b/dialogs/historydialog.h
	index 4ae6ad7..998eaf4 100644
	--- a/dialogs/historydialog.h
	+++ b/dialogs/historydialog.h
	@@ -1,41 +1,42 @@
	#ifndef UPLOADDIALOG_H
	#define UPLOADDIALOG_H

	#include <QDialog>
	#include <QItemSelection>

	namespace Ui {
	class HistoryDialog;
	}

	class QSortFilterProxyModel;
	class HistoryDialog : public QDialog
	{
	Q_OBJECT

	public:
	explicit HistoryDialog(QWidget *parent = 0);
	~HistoryDialog();

	private slots:
	void clear();
	void contextMenu(QPoint point);
	void copy();
	+ void deleteImage();
	void location();
	void open(QModelIndex index);
	void reloadHistory();
	void selectionChanged(QItemSelection selected, QItemSelection deselected);
	void upload();
	void uploadProgress(qint64 sent, qint64 total);

	protected:
	bool eventFilter(QObject object, QEvent event);

	private:
	Ui::HistoryDialog *ui;
	QSortFilterProxyModel *mFilterModel;
	QString mSelectedScreenshot;
	QModelIndex mContextIndex;
	};

	#endif // UPLOADDIALOG_H
	diff --git a/dialogs/historydialog.ui b/dialogs/historydialog.ui
	index 2287371..4dd6d64 100644
	--- a/dialogs/historydialog.ui
	+++ b/dialogs/historydialog.ui
	@@ -1,129 +1,132 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<ui version="4.0">
	<class>HistoryDialog</class>
	<widget class="QDialog" name="HistoryDialog">
	<property name="geometry">
	<rect>
	<x>0</x>
	<y>0</y>
	<width>327</width>
	<height>252</height>
	</rect>
	</property>
	<property name="windowTitle">
	<string>Screenshot History</string>
	</property>
	<property name="windowIcon">
	<iconset resource="../lightscreen.qrc">
	<normaloff>:/icons/view-history</normaloff>:/icons/view-history</iconset>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout">
	<property name="spacing">
	<number>4</number>
	</property>
	+ <property name="margin">
	+ <number>6</number>
	+ </property>
	<item>
	<widget class="QLineEdit" name="filterEdit">
	<property name="enabled">
	<bool>false</bool>
	</property>
	<property name="whatsThis">
	<string>Type here to filter through the screenshots in the list.</string>
	</property>
	<property name="styleSheet">
	<string notr="true">color: palette(mid);</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QTableView" name="tableView">
	<property name="whatsThis">
	<string>Double click the path to open the image with the default picture viewer, you can also double-click the URL to open it on your web browser.

	Right click items to get access to more options.</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QProgressBar" name="uploadProgressBar">
	<property name="enabled">
	<bool>false</bool>
	</property>
	<property name="value">
	<number>0</number>
	</property>
	<property name="textVisible">
	<bool>false</bool>
	</property>
	</widget>
	</item>
	<item>
	<layout class="QHBoxLayout" name="horizontalLayout">
	<item>
	<widget class="QPushButton" name="clearButton">
	<property name="enabled">
	<bool>false</bool>
	</property>
	<property name="text">
	<string>Clear</string>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="horizontalSpacer">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>40</width>
	<height>20</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<widget class="QPushButton" name="uploadButton">
	<property name="enabled">
	<bool>false</bool>
	</property>
	<property name="text">
	<string>Upload</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QPushButton" name="closeButton">
	<property name="text">
	<string>Close</string>
	</property>
	<property name="default">
	<bool>true</bool>
	</property>
	</widget>
	</item>
	</layout>
	</item>
	</layout>
	</widget>
	<resources>
	<include location="../lightscreen.qrc"/>
	</resources>
	<connections>
	<connection>
	<sender>closeButton</sender>
	<signal>clicked()</signal>
	<receiver>HistoryDialog</receiver>
	<slot>close()</slot>
	<hints>
	<hint type="sourcelabel">
	<x>279</x>
	<y>230</y>
	</hint>
	<hint type="destinationlabel">
	<x>163</x>
	<y>125</y>
	</hint>
	</hints>
	</connection>
	</connections>
	</ui>
	diff --git a/dialogs/optionsdialog.ui b/dialogs/optionsdialog.ui
	index edbb979..f0cac80 100644
	--- a/dialogs/optionsdialog.ui
	+++ b/dialogs/optionsdialog.ui
	@@ -1,1403 +1,1403 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<ui version="4.0">
	<class>OptionsDialog</class>
	<widget class="QDialog" name="OptionsDialog">
	<property name="geometry">
	<rect>
	<x>0</x>
	<y>0</y>
	<width>393</width>
	<height>311</height>
	</rect>
	</property>
	<property name="windowTitle">
	<string>Options - Lightscreen</string>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout_4">
	<property name="margin">
	<number>6</number>
	</property>
	<item>
	<widget class="QTabWidget" name="tabWidget">
	<property name="currentIndex">
	<number>0</number>
	</property>
	<widget class="QWidget" name="generalTab">
	<attribute name="title">
	<string>General</string>
	</attribute>
	<layout class="QVBoxLayout" name="verticalLayout">
	<property name="bottomMargin">
	<number>6</number>
	</property>
	<item>
	<widget class="QGroupBox" name="fileGroupBox">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="title">
	<string>File</string>
	</property>
	<property name="flat">
	<bool>true</bool>
	</property>
	<property name="checkable">
	<bool>true</bool>
	</property>
	<layout class="QGridLayout" name="fileGroupBoxLayout">
	<property name="verticalSpacing">
	<number>4</number>
	</property>
	<property name="margin">
	<number>6</number>
	</property>
	<item row="0" column="0">
	<widget class="QLabel" name="directoryLabel">
	<property name="text">
	<string>&Directory:</string>
	</property>
	<property name="alignment">
	<set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set>
	</property>
	<property name="buddy">
	<cstring>targetLineEdit</cstring>
	</property>
	</widget>
	</item>
	<item row="0" column="1">
	<widget class="QLineEdit" name="targetLineEdit">
	<property name="styleSheet">
	<string notr="true"/>
	</property>
	</widget>
	</item>
	<item row="0" column="2">
	<widget class="QPushButton" name="browsePushButton">
	<property name="maximumSize">
	<size>
	<width>60</width>
	<height>16777215</height>
	</size>
	</property>
	<property name="text">
	<string/>
	</property>
	<property name="icon">
	<iconset resource="../lightscreen.qrc">
	<normaloff>:/icons/folder</normaloff>:/icons/folder</iconset>
	</property>
	<property name="autoDefault">
	<bool>false</bool>
	</property>
	</widget>
	</item>
	<item row="1" column="0">
	<widget class="QLabel" name="filenameLabel">
	<property name="toolTip">
	<string>The prefix for the screenshot file</string>
	</property>
	<property name="text">
	<string>&Filename:</string>
	</property>
	<property name="alignment">
	<set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set>
	</property>
	<property name="buddy">
	<cstring>prefixLineEdit</cstring>
	</property>
	</widget>
	</item>
	<item row="1" column="1">
	<layout class="QHBoxLayout" name="filenameLayout">
	<property name="spacing">
	<number>3</number>
	</property>
	<item>
	<widget class="QLineEdit" name="prefixLineEdit">
	<property name="whatsThis">
	<string>The prefix will be inserted before the <em>Naming</em> in the screenshot file and it is usually used to distinguish files. It can be left blank.</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QComboBox" name="namingComboBox">
	<property name="whatsThis">
	<string>The naming is inserted after the prefix and is what makes each screenshot file unique to avoid overwriting.<br />
	<b>Numeric</b>: inserts a number in sequence, 1, 2, 3..<br />
	<b>Date</b>: inserts the current date and time, in the form of dd-MM-yyyy, click the "wrench" button on the right to customize the format.<br />
	<b>Timestamp</b>: inserts a number, a Unix timestamp, which is the number of seconds passed since 1970-1-1 00:00:00.<br />

	</string>
	</property>
	<item>
	<property name="text">
	<string>(number)</string>
	</property>
	</item>
	<item>
	<property name="text">
	<string>(date)</string>
	</property>
	</item>
	<item>
	<property name="text">
	<string>(timestamp)</string>
	</property>
	</item>
	<item>
	<property name="text">
	<string>(none)</string>
	</property>
	</item>
	</widget>
	</item>
	</layout>
	</item>
	<item row="1" column="2">
	<widget class="QPushButton" name="namingOptionsButton">
	<property name="icon">
	<iconset resource="../lightscreen.qrc">
	<normaloff>:/icons/configure</normaloff>:/icons/configure</iconset>
	</property>
	<property name="autoDefault">
	<bool>false</bool>
	</property>
	</widget>
	</item>
	<item row="3" column="0">
	<widget class="QLabel" name="formatLabel">
	<property name="toolTip">
	<string>The file format for the screenshot</string>
	</property>
	<property name="text">
	<string>F&ormat:</string>
	</property>
	<property name="alignment">
	<set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set>
	</property>
	<property name="buddy">
	<cstring>formatComboBox</cstring>
	</property>
	</widget>
	</item>
	<item row="3" column="1">
	<widget class="QComboBox" name="formatComboBox">
	<item>
	<property name="text">
	<string notr="true">PNG</string>
	</property>
	</item>
	<item>
	<property name="text">
	<string notr="true">JPG</string>
	</property>
	</item>
	<item>
	<property name="text">
	<string notr="true">BMP</string>
	</property>
	</item>
	</widget>
	</item>
	<item row="4" column="0">
	<widget class="QLabel" name="qualityLabel">
	<property name="text">
	<string>&Quality:</string>
	</property>
	<property name="alignment">
	<set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set>
	</property>
	<property name="buddy">
	<cstring>qualitySlider</cstring>
	</property>
	</widget>
	</item>
	<item row="4" column="1">
	<widget class="QSlider" name="qualitySlider">
	<property name="whatsThis">
	<string>This slider goes from 0 to 100. 100 being the highest quality and 0 the lowest.<br>
	Quality is related to file size and of course to readability and overall quality of the image.</string>
	</property>
	<property name="maximum">
	<number>100</number>
	</property>
	<property name="pageStep">
	<number>5</number>
	</property>
	<property name="value">
	<number>100</number>
	</property>
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	</widget>
	</item>
	<item row="4" column="2">
	<layout class="QHBoxLayout" name="qualityLayout">
	<property name="spacing">
	<number>0</number>
	</property>
	<property name="sizeConstraint">
	<enum>QLayout::SetMinimumSize</enum>
	</property>
	<item>
	<widget class="QLabel" name="qualityValueLabel">
	<property name="font">
	<font>
	<pointsize>8</pointsize>
	</font>
	</property>
	<property name="text">
	<string notr="true">100</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QLabel" name="qualityPercentLabel">
	<property name="font">
	<font>
	<pointsize>7</pointsize>
	</font>
	</property>
	<property name="text">
	<string notr="true">%</string>
	</property>
	</widget>
	</item>
	</layout>
	</item>
	<item row="5" column="0">
	<widget class="QLabel" name="previewTextLabel">
	<property name="text">
	<string><u>Preview</u>:</string>
	</property>
	<property name="alignment">
	<set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set>
	</property>
	</widget>
	</item>
	<item row="5" column="1">
	<widget class="QLabel" name="previewLabel">
	<property name="text">
	<string/>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<spacer name="verticalSpacer">
	<property name="orientation">
	<enum>Qt::Vertical</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>0</width>
	<height>0</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<widget class="QGroupBox" name="startupGroupBox">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="title">
	<string>System Startup</string>
	</property>
	<property name="flat">
	<bool>true</bool>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout_3">
	<item>
	<widget class="QCheckBox" name="startupCheckBox">
	<property name="whatsThis">
	<string/>
	</property>
	<property name="text">
	<string>&Run Lightscreen at system startup.</string>
	</property>
	</widget>
	</item>
	<item>
	<layout class="QHBoxLayout" name="startupHideLayout">
	<item>
	<spacer name="startupHideSpacer">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeType">
	<enum>QSizePolicy::Fixed</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>13</width>
	<height>15</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<widget class="QCheckBox" name="startupHideCheckBox">
	<property name="whatsThis">
	<string/>
	</property>
	<property name="text">
	<string>H&ide the main window.</string>
	</property>
	</widget>
	</item>
	</layout>
	</item>
	</layout>
	</widget>
	</item>
	</layout>
	</widget>
	<widget class="QWidget" name="hotkeyTab">
	<attribute name="title">
	<string>Hotkeys</string>
	</attribute>
	<layout class="QVBoxLayout" name="verticalLayout_2">
	<item>
	<widget class="QGroupBox" name="capturesGroupBox">
	<property name="title">
	<string>Captures</string>
	</property>
	<property name="flat">
	<bool>true</bool>
	</property>
	<layout class="QGridLayout" name="gridLayout">
	<property name="margin">
	<number>6</number>
	</property>
	<property name="spacing">
	<number>4</number>
	</property>
	<item row="0" column="0">
	<widget class="QCheckBox" name="screenCheckBox">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="text">
	<string>&Fullscreen</string>
	</property>
	</widget>
	</item>
	<item row="0" column="2">
	<widget class="HotkeyWidget" name="screenHotkeyWidget">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Minimum" vsizetype="Maximum">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	</widget>
	</item>
	<item row="3" column="0">
	<widget class="QCheckBox" name="windowPickerCheckBox">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="text">
	<string>Window &Picker</string>
	</property>
	</widget>
	</item>
	<item row="3" column="2">
	<widget class="HotkeyWidget" name="windowPickerHotkeyWidget"/>
	</item>
	<item row="2" column="1">
	<spacer name="horizontalSpacer_4">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>40</width>
	<height>0</height>
	</size>
	</property>
	</spacer>
	</item>
	<item row="2" column="0">
	<widget class="QCheckBox" name="windowCheckBox">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="text">
	<string>Active &Window</string>
	</property>
	</widget>
	</item>
	<item row="2" column="2">
	<widget class="HotkeyWidget" name="windowHotkeyWidget"/>
	</item>
	<item row="1" column="0">
	<widget class="QCheckBox" name="areaCheckBox">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="text">
	<string>Screen &Area</string>
	</property>
	</widget>
	</item>
	<item row="1" column="2">
	<widget class="HotkeyWidget" name="areaHotkeyWidget"/>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<widget class="QGroupBox" name="controlGroupBox">
	<property name="title">
	<string>Lightscreen Control</string>
	</property>
	<property name="flat">
	<bool>true</bool>
	</property>
	<layout class="QGridLayout" name="gridLayout_2">
	<property name="margin">
	<number>6</number>
	</property>
	<property name="spacing">
	<number>4</number>
	</property>
	<item row="0" column="0">
	<widget class="QCheckBox" name="openCheckBox">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="text">
	<string>&Open the program window</string>
	</property>
	</widget>
	</item>
	<item row="0" column="2">
	<widget class="HotkeyWidget" name="openHotkeyWidget"/>
	</item>
	<item row="1" column="0">
	<widget class="QCheckBox" name="directoryCheckBox">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="text">
	<string>Open the &directory</string>
	</property>
	</widget>
	</item>
	<item row="1" column="2">
	<widget class="HotkeyWidget" name="directoryHotkeyWidget"/>
	</item>
	<item row="0" column="1">
	<spacer name="horizontalSpacer_2">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>40</width>
	<height>0</height>
	</size>
	</property>
	</spacer>
	</item>
	</layout>
	</widget>
	</item>
	</layout>
	</widget>
	<widget class="QWidget" name="optionsTab">
	<attribute name="title">
	<string>Options</string>
	</attribute>
	<layout class="QVBoxLayout" name="verticalLayout_8">
	<property name="margin">
	<number>0</number>
	</property>
	<item>
	<widget class="QScrollArea" name="optionsScrollArea">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="minimumSize">
	<size>
	<width>375</width>
	<height>0</height>
	</size>
	</property>
	<property name="frameShape">
	<enum>QFrame::NoFrame</enum>
	</property>
	<property name="horizontalScrollBarPolicy">
	<enum>Qt::ScrollBarAlwaysOff</enum>
	</property>
	<property name="widgetResizable">
	<bool>true</bool>
	</property>
	<widget class="QWidget" name="scrollAreaWidgetContents">
	<property name="geometry">
	<rect>
	<x>0</x>
	<y>0</y>
	- <width>364</width>
	+ <width>311</width>
	<height>780</height>
	</rect>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout_5">
	<property name="spacing">
	<number>4</number>
	</property>
	<property name="margin">
	<number>6</number>
	</property>
	<item>
	<widget class="QGroupBox" name="interfaceGroupBox">
	<property name="title">
	<string>Interface</string>
	</property>
	<property name="flat">
	<bool>true</bool>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout_6">
	<item>
	<widget class="QCheckBox" name="trayCheckBox">
	<property name="whatsThis">
	<string/>
	</property>
	<property name="text">
	<string>Sho&w a system tray icon.</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QCheckBox" name="hideCheckBox">
	<property name="text">
	<string>&Hide Lightscreen while taking a screenshot.</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QCheckBox" name="warnHideCheckBox">
	<property name="text">
	<string>Warn when hiding without a tra&y icon.</string>
	</property>
	</widget>
	</item>
	<item>
	<layout class="QGridLayout" name="notifyLayout">
	<property name="topMargin">
	<number>2</number>
	</property>
	<property name="bottomMargin">
	<number>2</number>
	</property>
	<item row="1" column="1">
	<widget class="QCheckBox" name="messageCheckBox">
	<property name="whatsThis">
	<string>Shows a completion message once the screenshot is saved, clicking this message takes you to the directory where the screenshot was saved.</string>
	</property>
	<property name="text">
	<string>Tray icon Popup</string>
	</property>
	</widget>
	</item>
	<item row="2" column="1">
	<widget class="QCheckBox" name="playSoundCheckBox">
	<property name="text">
	<string>&Sound cue</string>
	</property>
	</widget>
	</item>
	<item row="1" column="0">
	<spacer name="horizontalSpacer_9">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeType">
	<enum>QSizePolicy::Fixed</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>15</width>
	<height>0</height>
	</size>
	</property>
	</spacer>
	</item>
	<item row="1" column="2">
	<spacer name="horizontalSpacer">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>40</width>
	<height>0</height>
	</size>
	</property>
	</spacer>
	</item>
	<item row="0" column="0" colspan="3">
	<widget class="QLabel" name="notifyLabel">
	<property name="font">
	<font>
	<weight>75</weight>
	<bold>true</bold>
	<underline>true</underline>
	</font>
	</property>
	<property name="text">
	<string>&Notify with:</string>
	</property>
	<property name="buddy">
	<cstring>messageCheckBox</cstring>
	</property>
	</widget>
	</item>
	</layout>
	</item>
	<item>
	<layout class="QHBoxLayout" name="languageLayout">
	<item>
	<widget class="QLabel" name="languageLabel">
	<property name="text">
	<string>&Language:</string>
	</property>
	<property name="buddy">
	<cstring>languageComboBox</cstring>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QComboBox" name="languageComboBox">
	<property name="focusPolicy">
	<enum>Qt::NoFocus</enum>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QLabel" name="moreInformationLabel">
	<property name="whatsThis">
	<string>Click here to go to the Lightscreen homepage to learn more about translations.</string>
	</property>
	<property name="text">
	<string><a href="http://lightscreen.sourceforge.net/translation">More information..</a></string>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="languageSpacer">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>40</width>
	<height>0</height>
	</size>
	</property>
	</spacer>
	</item>
	</layout>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<widget class="QGroupBox" name="previewGroupBox">
	<property name="title">
	<string>Screenshot Previews</string>
	</property>
	<property name="flat">
	<bool>true</bool>
	</property>
	<property name="checkable">
	<bool>true</bool>
	</property>
	<property name="checked">
	<bool>true</bool>
	</property>
	<layout class="QGridLayout" name="gridLayout_3">
	<item row="0" column="0">
	<widget class="QLabel" name="previewSizeLabel">
	<property name="text">
	<string>Maximum Size:</string>
	</property>
	<property name="buddy">
	<cstring>previewSizeSpinBox</cstring>
	</property>
	</widget>
	</item>
	<item row="0" column="1">
	<widget class="QSpinBox" name="previewSizeSpinBox">
	<property name="buttonSymbols">
	<enum>QAbstractSpinBox::PlusMinus</enum>
	</property>
	<property name="accelerated">
	<bool>true</bool>
	</property>
	<property name="correctionMode">
	<enum>QAbstractSpinBox::CorrectToNearestValue</enum>
	</property>
	<property name="suffix">
	<string notr="true"> px</string>
	</property>
	<property name="minimum">
	<number>200</number>
	</property>
	<property name="maximum">
	<number>800</number>
	</property>
	<property name="singleStep">
	<number>10</number>
	</property>
	<property name="value">
	<number>300</number>
	</property>
	</widget>
	</item>
	<item row="0" column="4" rowspan="4">
	<spacer name="horizontalSpacer_5">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>40</width>
	<height>20</height>
	</size>
	</property>
	</spacer>
	</item>
	<item row="1" column="0">
	<widget class="QLabel" name="previewPositionLabel">
	<property name="text">
	<string>Position:</string>
	</property>
	<property name="buddy">
	<cstring>previewPositionComboBox</cstring>
	</property>
	</widget>
	</item>
	<item row="1" column="1" colspan="2">
	<widget class="QComboBox" name="previewPositionComboBox">
	<property name="currentIndex">
	<number>3</number>
	</property>
	<item>
	<property name="text">
	<string>Top Left</string>
	</property>
	</item>
	<item>
	<property name="text">
	<string>Top Right</string>
	</property>
	</item>
	<item>
	<property name="text">
	<string>Bottom Left</string>
	</property>
	</item>
	<item>
	<property name="text">
	<string>Bottom Right</string>
	</property>
	</item>
	</widget>
	</item>
	<item row="2" column="0">
	<widget class="QCheckBox" name="previewAutocloseCheckBox">
	<property name="text">
	<string>Auto-close after</string>
	</property>
	</widget>
	</item>
	<item row="2" column="1">
	<widget class="QSpinBox" name="previewAutocloseTimeSpinBox">
	<property name="suffix">
	<string> seconds</string>
	</property>
	</widget>
	</item>
	<item row="2" column="2">
	<widget class="QLabel" name="andLabel">
	<property name="minimumSize">
	<size>
	<width>20</width>
	<height>0</height>
	</size>
	</property>
	<property name="text">
	<string> and </string>
	</property>
	<property name="alignment">
	<set>Qt::AlignCenter</set>
	</property>
	<property name="buddy">
	<cstring>previewAutocloseActionComboBox</cstring>
	</property>
	</widget>
	</item>
	<item row="2" column="3">
	<widget class="QComboBox" name="previewAutocloseActionComboBox">
	<property name="currentIndex">
	<number>0</number>
	</property>
	<item>
	<property name="text">
	<string>save</string>
	</property>
	</item>
	<item>
	<property name="text">
	<string>upload</string>
	</property>
	</item>
	<item>
	<property name="text">
	<string>cancel</string>
	</property>
	</item>
	</widget>
	</item>
	<item row="3" column="0">
	<widget class="QLabel" name="previewDefaultActionLabel">
	<property name="text">
	<string>Default action:</string>
	</property>
	<property name="buddy">
	<cstring>previewDefaultActionComboBox</cstring>
	</property>
	</widget>
	</item>
	<item row="3" column="1">
	<widget class="QComboBox" name="previewDefaultActionComboBox">
	<item>
	<property name="text">
	<string>save</string>
	</property>
	</item>
	<item>
	<property name="text">
	<string>upload</string>
	</property>
	</item>
	</widget>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<widget class="QGroupBox" name="screenshotsGroupBox">
	<property name="title">
	<string>Screenshots</string>
	</property>
	<property name="flat">
	<bool>true</bool>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout_7">
	<item>
	<widget class="QCheckBox" name="saveAsCheckBox">
	<property name="text">
	<string>Choose where to save each screenshot ("&Save as").</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QCheckBox" name="currentMonitorCheckBox">
	<property name="text">
	<string>&Grab only the active monitor.</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QCheckBox" name="cursorCheckBox">
	<property name="text">
	<string>Inc&lude the cursor in the screenshot.</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QCheckBox" name="magnifyCheckBox">
	<property name="text">
	<string>&Magnify around the mouse in Area mode.</string>
	</property>
	</widget>
	</item>
	<item>
	<layout class="QHBoxLayout" name="horizontalLayout_2">
	<property name="spacing">
	<number>2</number>
	</property>
	<item>
	<widget class="QCheckBox" name="optiPngCheckBox">
	<property name="toolTip">
	<string>Runs OptiPNG which reduces screenshot file size.</string>
	</property>
	<property name="text">
	<string>O&ptimize PNG screenshots.</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QLabel" name="optiPngLabel">
	<property name="palette">
	<palette>
	<active>
	<colorrole role="WindowText">
	<brush brushstyle="SolidPattern">
	<color alpha="255">
	<red>128</red>
	<green>0</green>
	<blue>0</blue>
	</color>
	</brush>
	</colorrole>
	</active>
	<inactive>
	<colorrole role="WindowText">
	<brush brushstyle="SolidPattern">
	<color alpha="255">
	<red>128</red>
	<green>0</green>
	<blue>0</blue>
	</color>
	</brush>
	</colorrole>
	</inactive>
	<disabled>
	<colorrole role="WindowText">
	<brush brushstyle="SolidPattern">
	<color alpha="255">
	<red>141</red>
	<green>138</green>
	<blue>136</blue>
	</color>
	</brush>
	</colorrole>
	</disabled>
	</palette>
	</property>
	<property name="text">
	<string/>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="horizontalSpacer_10">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>40</width>
	<height>0</height>
	</size>
	</property>
	</spacer>
	</item>
	</layout>
	</item>
	<item>
	<widget class="QCheckBox" name="replaceCheckBox">
	<property name="text">
	<string>Replace screenshots when there's an existing file.</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QCheckBox" name="areaAutocloseCheckBox">
	<property name="text">
	<string>Snap area screenshots automatically (no resizing).</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QCheckBox" name="uploadCheckBox">
	<property name="text">
	<string>Upload all my screenshots automatically.</string>
	</property>
	</widget>
	</item>
	<item>
	<layout class="QHBoxLayout" name="horizontalLayout_5">
	<item>
	<widget class="QLabel" name="delayLabel">
	<property name="text">
	<string>D&elay:</string>
	</property>
	<property name="alignment">
	<set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set>
	</property>
	<property name="buddy">
	<cstring>delaySpinBox</cstring>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QSpinBox" name="delaySpinBox">
	<property name="whatsThis">
	<string>Selecting anything other than 0 in this option will cause the program to <b>wait</b> that amount of seconds before taking the screenshot.</string>
	</property>
	<property name="specialValueText">
	<string>none</string>
	</property>
	<property name="accelerated">
	<bool>true</bool>
	</property>
	<property name="correctionMode">
	<enum>QAbstractSpinBox::CorrectToNearestValue</enum>
	</property>
	<property name="suffix">
	<string> seconds</string>
	</property>
	<property name="prefix">
	<string/>
	</property>
	<property name="maximum">
	<number>32767</number>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="horizontalSpacer_8">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>114</width>
	<height>0</height>
	</size>
	</property>
	</spacer>
	</item>
	</layout>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<widget class="QGroupBox" name="clipboardGroupBox">
	<property name="title">
	<string>Clipboard</string>
	</property>
	<property name="flat">
	<bool>true</bool>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout_10">
	<item>
	<widget class="QCheckBox" name="clipboardCheckBox">
	<property name="text">
	<string>&Copy the screenshot to the clipboard.</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QCheckBox" name="imgurClipboardCheckBox">
	<property name="text">
	<string>After uploading, copy the imgur URL to the clipboard.</string>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<widget class="QGroupBox" name="historyGroupBox">
	<property name="title">
	<string>History</string>
	</property>
	<property name="flat">
	<bool>true</bool>
	</property>
	<layout class="QHBoxLayout" name="historyLayout">
	<item>
	<widget class="QCheckBox" name="historyCheckBox">
	<property name="text">
	<string>Save my screenshot history.</string>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="horizontalSpacer_6">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>95</width>
	<height>20</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<widget class="QPushButton" name="historyPushButton">
	<property name="text">
	<string>View &History</string>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<widget class="QGroupBox" name="updaterGroupBox">
	<property name="title">
	<string>Updater</string>
	</property>
	<property name="flat">
	<bool>true</bool>
	</property>
	<layout class="QHBoxLayout" name="updaterLayout">
	<item>
	<widget class="QCheckBox" name="updaterCheckBox">
	<property name="text">
	<string>Check for updates regularly.</string>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="horizontalSpacer_3">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>40</width>
	<height>0</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<widget class="QPushButton" name="checkUpdatesPushButton">
	<property name="text">
	<string>Chec&k Now</string>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	</item>
	</layout>
	</widget>
	</widget>
	</item>
	</layout>
	</widget>
	<widget class="QWidget" name="aboutTab">
	<attribute name="title">
	<string>About</string>
	</attribute>
	<layout class="QVBoxLayout" name="verticalLayout_9">
	<item>
	<widget class="QLabel" name="mainLabel">
	<property name="text">
	<string>Lightscreen is a simple tool to take screenshots, designed to be customizable and lightweight.<br><br>
	Created by <a href="http://ckaiser.com.ar">Christian Kaiser</a>, using the <a href="#aboutqt">Qt toolkit</a> for the graphical user interface.</string>
	</property>
	<property name="wordWrap">
	<bool>true</bool>
	</property>
	<property name="textInteractionFlags">
	<set>Qt::LinksAccessibleByKeyboard\|Qt::LinksAccessibleByMouse</set>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QLabel" name="licenseAboutLabel">
	<property name="text">
	<string>Released under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License</a>.<br><br>
	Special thanks goes to the <a href="http://lightscreen.sourceforge.net/about">Donators and Translators</a>.</string>
	</property>
	<property name="textInteractionFlags">
	<set>Qt::LinksAccessibleByKeyboard\|Qt::LinksAccessibleByMouse</set>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QLabel" name="versionLabel">
	<property name="font">
	<font>
	<pointsize>12</pointsize>
	<weight>75</weight>
	<bold>true</bold>
	</font>
	</property>
	<property name="alignment">
	<set>Qt::AlignCenter</set>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QLabel" name="linksLabel">
	<property name="text">
	<string><a href="https://sourceforge.net/projects/lightscreen/">Visit Sourceforge project site</a><br><br><a href="http://lightscreen.sourceforge.net/">Visit Lightscreen home page</a></string>
	</property>
	<property name="alignment">
	<set>Qt::AlignCenter</set>
	</property>
	<property name="textInteractionFlags">
	<set>Qt::LinksAccessibleByKeyboard\|Qt::LinksAccessibleByMouse</set>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	</widget>
	</item>
	<item>
	<widget class="QDialogButtonBox" name="buttonBox">
	<property name="standardButtons">
	<set>QDialogButtonBox::Cancel\|QDialogButtonBox::Ok</set>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	<customwidgets>
	<customwidget>
	<class>HotkeyWidget</class>
	<extends>QPushButton</extends>
	<header>widgets/hotkeywidget.h</header>
	</customwidget>
	</customwidgets>
	<tabstops>
	<tabstop>fileGroupBox</tabstop>
	<tabstop>targetLineEdit</tabstop>
	<tabstop>browsePushButton</tabstop>
	<tabstop>prefixLineEdit</tabstop>
	<tabstop>namingComboBox</tabstop>
	<tabstop>namingOptionsButton</tabstop>
	<tabstop>formatComboBox</tabstop>
	<tabstop>qualitySlider</tabstop>
	<tabstop>startupCheckBox</tabstop>
	<tabstop>startupHideCheckBox</tabstop>
	<tabstop>screenCheckBox</tabstop>
	<tabstop>screenHotkeyWidget</tabstop>
	<tabstop>areaCheckBox</tabstop>
	<tabstop>areaHotkeyWidget</tabstop>
	<tabstop>windowCheckBox</tabstop>
	<tabstop>windowHotkeyWidget</tabstop>
	<tabstop>windowPickerCheckBox</tabstop>
	<tabstop>windowPickerHotkeyWidget</tabstop>
	<tabstop>openCheckBox</tabstop>
	<tabstop>openHotkeyWidget</tabstop>
	<tabstop>directoryCheckBox</tabstop>
	<tabstop>directoryHotkeyWidget</tabstop>
	<tabstop>optionsScrollArea</tabstop>
	<tabstop>trayCheckBox</tabstop>
	<tabstop>hideCheckBox</tabstop>
	<tabstop>warnHideCheckBox</tabstop>
	<tabstop>messageCheckBox</tabstop>
	<tabstop>playSoundCheckBox</tabstop>
	<tabstop>previewGroupBox</tabstop>
	<tabstop>previewSizeSpinBox</tabstop>
	<tabstop>previewPositionComboBox</tabstop>
	<tabstop>previewAutocloseCheckBox</tabstop>
	<tabstop>previewAutocloseTimeSpinBox</tabstop>
	<tabstop>previewAutocloseActionComboBox</tabstop>
	<tabstop>previewDefaultActionComboBox</tabstop>
	<tabstop>saveAsCheckBox</tabstop>
	<tabstop>currentMonitorCheckBox</tabstop>
	<tabstop>cursorCheckBox</tabstop>
	<tabstop>magnifyCheckBox</tabstop>
	<tabstop>optiPngCheckBox</tabstop>
	<tabstop>replaceCheckBox</tabstop>
	<tabstop>areaAutocloseCheckBox</tabstop>
	<tabstop>uploadCheckBox</tabstop>
	<tabstop>delaySpinBox</tabstop>
	<tabstop>historyCheckBox</tabstop>
	<tabstop>historyPushButton</tabstop>
	<tabstop>updaterCheckBox</tabstop>
	<tabstop>checkUpdatesPushButton</tabstop>
	<tabstop>buttonBox</tabstop>
	</tabstops>
	<resources>
	<include location="../lightscreen.qrc"/>
	</resources>
	<connections>
	<connection>
	<sender>buttonBox</sender>
	<signal>rejected()</signal>
	<receiver>OptionsDialog</receiver>
	<slot>reject()</slot>
	<hints>
	<hint type="sourcelabel">
	<x>307</x>
	<y>304</y>
	</hint>
	<hint type="destinationlabel">
	<x>286</x>
	<y>274</y>
	</hint>
	</hints>
	</connection>
	<connection>
	<sender>previewAutocloseCheckBox</sender>
	<signal>toggled(bool)</signal>
	<receiver>previewAutocloseTimeSpinBox</receiver>
	<slot>setEnabled(bool)</slot>
	<hints>
	<hint type="sourcelabel">
	<x>118</x>
	<y>511</y>
	</hint>
	<hint type="destinationlabel">
	<x>210</x>
	<y>529</y>
	</hint>
	</hints>
	</connection>
	<connection>
	<sender>previewAutocloseCheckBox</sender>
	<signal>toggled(bool)</signal>
	<receiver>previewAutocloseActionComboBox</receiver>
	<slot>setEnabled(bool)</slot>
	<hints>
	<hint type="sourcelabel">
	<x>115</x>
	<y>511</y>
	</hint>
	<hint type="destinationlabel">
	<x>302</x>
	<y>529</y>
	</hint>
	</hints>
	</connection>
	</connections>
	</ui>
	diff --git a/images/area.big.png b/images/area.big.png
	new file mode 100644
	index 0000000..c3e1c8f
	Binary files /dev/null and b/images/area.big.png differ
	diff --git a/images/imgur.uploading.png b/images/imgur.uploading.png
	new file mode 100644
	index 0000000..4fb6ec4
	Binary files /dev/null and b/images/imgur.uploading.png differ
	diff --git a/images/picker.big.png b/images/picker.big.png
	new file mode 100644
	index 0000000..92adeda
	Binary files /dev/null and b/images/picker.big.png differ
	diff --git a/images/screen.big.png b/images/screen.big.png
	new file mode 100644
	index 0000000..748baa3
	Binary files /dev/null and b/images/screen.big.png differ
	diff --git a/lightscreen.qrc b/lightscreen.qrc
	index c477842..c4ebcef 100644
	--- a/lightscreen.qrc
	+++ b/lightscreen.qrc
	@@ -1,35 +1,39 @@
	<RCC>
	<qresource prefix="/icons">
	<file alias="lightscreen">images/LS.ico</file>
	<file alias="lightscreen.small">images/LSSmall.png</file>
	<file alias="lightscreen.yes">images/LS.systemtray.good.png</file>
	<file alias="lightscreen.no">images/LS.systemtray.bad.png</file>
	<file alias="yes">images/good.png</file>
	<file alias="no">images/bad.png</file>
	<file alias="yes.big">images/area-accept.png</file>
	<file alias="no.big">images/area-cancel.png</file>
	<file alias="folder">images/document-open-folder.png</file>
	<file alias="configure">images/configure.png</file>
	<file alias="help">images/help.png</file>
	<file alias="arrow-left">images/previewArrowLeft.png</file>
	<file alias="arrow-right">images/previewArrowRight.png</file>
	<file alias="picker">images/picker.png</file>
	<file alias="zoom.in">images/zoom-in.png</file>
	<file alias="zoom.out">images/zoom-out.png</file>
	<file alias="screen">images/screen.png</file>
	<file alias="area">images/area.png</file>
	<file alias="window">images/window.png</file>
	<file alias="imgur">images/imgur.png</file>
	<file alias="imgur.yes">images/imgur.yes.png</file>
	<file alias="view-history">images/view-history.png</file>
	+ <file alias="imgur.upload">images/imgur.uploading.png</file>
	+ <file alias="area.big">images/area.big.png</file>
	+ <file alias="picker.big">images/picker.big.png</file>
	+ <file alias="sceen.big">images/screen.big.png</file>
	</qresource>
	<qresource prefix="/backgrounds">
	<file alias="checkerboard">images/checkerboard.png</file>
	</qresource>
	<qresource prefix="/translations">
	<file alias="Español">translations/spanish.qm</file>
	</qresource>
	<qresource prefix="/translations_qt">
	<file alias="Español">translations/qt/qt_es.qm</file>
	</qresource>
	</RCC>
	diff --git a/lightscreenwindow.cpp b/lightscreenwindow.cpp
	index a8f6aa8..03d45c2 100644
	--- a/lightscreenwindow.cpp
	+++ b/lightscreenwindow.cpp
	@@ -1,966 +1,978 @@
	/*
	* Copyright (C) 2011 Christian Kaiser
	*
	* 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 library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*
	*/
	#include <QMainWindow>
	#include <QDate>
	#include <QDesktopServices>
	#include <QFileInfo>
	#include <QHttp>
	#include <QKeyEvent>
	#include <QMenu>
	#include <QMessageBox>
	#include <QPointer>
	#include <QProcess>
	#include <QSettings>
	#include <QSound>
	#include <QSystemTrayIcon>
	#include <QTimer>
	#include <QToolTip>
	#include <QUrl>

	#include <QDebug>

	#ifdef Q_WS_WIN
	#include <windows.h>
	#include "tools/qwin7utils/Taskbar.h"
	#include "tools/qwin7utils/TaskbarButton.h"
	using namespace QW7;
	#endif

	/*
	* Lightscreen includes
	*/
	#include "lightscreenwindow.h"
	#include "dialogs/optionsdialog.h"
	#include "dialogs/previewdialog.h"
	#include "dialogs/historydialog.h"

	#include "tools/globalshortcut/globalshortcutmanager.h"
	#include "tools/os.h"
	#include "tools/screenshot.h"
	#include "tools/screenshotmanager.h"

	#include "tools/uploader.h"

	#include "updater/updater.h"

	LightscreenWindow::LightscreenWindow(QWidget *parent) :
	QMainWindow(parent),
	mDoCache(false),
	mHideTrigger(false),
	mReviveMain(false),
	mWasVisible(true),
	mLastMessage(0),
	mLastMode(-1),
	mLastScreenshot()
	{
	os::translate(settings()->value("options/language", "English").toString());

	ui.setupUi(this);

	setMaximumSize(size());
	setMinimumSize(size());

	- setWindowFlags(Qt::Window); // Remove the what's this button, no real use in the main window.
	+ setWindowFlags(Qt::Window);

	#ifdef Q_WS_WIN
	if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) {
	mTaskbarButton = new TaskbarButton(this);
	}
	#endif

	// Actions
	connect(ui.screenPushButton, SIGNAL(clicked()), this, SLOT(screenshotAction()));
	connect(ui.areaPushButton , SIGNAL(clicked()), this, SLOT(areaHotkey()));
	connect(ui.windowPushButton, SIGNAL(clicked()), this, SLOT(windowPickerHotkey()));

	connect(ui.optionsPushButton, SIGNAL(clicked()), this, SLOT(showOptions()));
	connect(ui.folderPushButton , SIGNAL(clicked()), this, SLOT(goToFolder()));

	- // TODO: Imgur menu
	connect(ui.imgurPushButton, SIGNAL(clicked()), this, SLOT(showUploadMenu()));

	// Uploader
	- connect(Uploader::instance(), SIGNAL(progress(qint64,qint64)), this, SLOT(uploadProgress(qint64, qint64)));
	- connect(Uploader::instance(), SIGNAL(done(QString, QString)) , this, SLOT(showUploaderMessage(QString, QString)));
	- connect(Uploader::instance(), SIGNAL(error(QString)) , this, SLOT(showUploaderError(QString)));
	+ connect(Uploader::instance(), SIGNAL(progress(qint64, qint64)), this, SLOT(uploadProgress(qint64, qint64)));
	+ connect(Uploader::instance(), SIGNAL(done(QString, QString, QString)), this, SLOT(showUploaderMessage(QString, QString)));
	+ connect(Uploader::instance(), SIGNAL(error(QString)), this, SLOT(showUploaderError(QString)));

	// Manager
	connect(ScreenshotManager::instance(), SIGNAL(confirm(Screenshot)), this, SLOT(preview(Screenshot)));
	connect(ScreenshotManager::instance(), SIGNAL(windowCleanup(Screenshot::Options&)), this, SLOT(cleanup(Screenshot::Options&)));

	if (!settings()->contains("file/format")) {
	showOptions(); // There are no options (or the options config is invalid or incomplete)
	}
	else {
	QTimer::singleShot(0 , this, SLOT(applySettings()));
	QTimer::singleShot(5000, this, SLOT(checkForUpdates()));
	}
	}

	LightscreenWindow::~LightscreenWindow()
	{
	settings()->setValue("lastScreenshot", mLastScreenshot);
	settings()->sync();

	GlobalShortcutManager::instance()->clear();
	delete mTrayIcon;
	}

	void LightscreenWindow::action(int mode)
	{
	if (mode == 4) {
	goToFolder();
	}
	else {
	show();
	}
	}

	void LightscreenWindow::areaHotkey()
	{
	screenshotAction(2);
	}

	void LightscreenWindow::checkForUpdates()
	{
	if (settings()->value("options/disableUpdater", false).toBool())
	return;

	if (settings()->value("lastUpdateCheck").toInt() + 7
	> QDate::currentDate().dayOfYear())
	return; // If 7 days have not passed since the last update check.

	connect(Updater::instance(), SIGNAL(done(bool)), this, SLOT(updaterDone(bool)));
	Updater::instance()->check();
	}

	void LightscreenWindow::cleanup(Screenshot::Options &options)
	{
	// Reversing settings
	if (settings()->value("options/hide").toBool()) {
	#ifndef Q_WS_X11 // X is not quick enough and the notification ends up everywhere but in the icon
	if (settings()->value("options/tray").toBool() && mTrayIcon) {
	mTrayIcon->show();
	}
	#endif

	if (mPreviewDialog) {
	if (mPreviewDialog->count() <= 1 && mWasVisible) {
	show();
	}

	mPreviewDialog->show();
	}
	else if (mWasVisible) {
	show();
	}

	mHideTrigger = false;
	}

	if (settings()->value("options/tray").toBool() && mTrayIcon) {
	notify(options.result);

	if (settings()->value("options/message").toBool() && options.file) {
	showScreenshotMessage(options.result, options.fileName);
	}
	}

	if (settings()->value("options/playSound", false).toBool()) {
	if (options.result == Screenshot::Success) {
	QSound::play("sounds/ls.screenshot.wav");
	}
	else {
	#ifdef Q_WS_WIN
	QSound::play("afakepathtomakewindowsplaythedefaultsoundtheresprobablyabetterwaybuticantbebothered");
	#else
	QSound::play("sound/ls.error.wav");
	#endif
	}
	}

	if (options.result != Screenshot::Success)
	return;

	mLastScreenshot = options.fileName;
	}

	bool LightscreenWindow::closingWithoutTray()
	{
	if (settings()->value("options/disableHideAlert", false).toBool())
	return false;

	QMessageBox msgBox;
	msgBox.setWindowTitle(tr("Lightscreen"));
	msgBox.setText(tr("You have chosen to hide Lightscreen when there's no system tray icon, so you will not be able to access the program <b>unless you have selected a hotkey to do so</b>.<br>What do you want to do?"));
	msgBox.setIcon(QMessageBox::Warning);

	msgBox.setStyleSheet("QPushButton { padding: 4px 8px; }");

	QPushButton *enableButton = msgBox.addButton(tr("Hide but enable tray"),
	QMessageBox::ActionRole);
	QPushButton *enableAndDenotifyButton = msgBox.addButton(tr("Hide and don't warn"),
	QMessageBox::ActionRole);
	QPushButton *hideButton = msgBox.addButton(tr("Just hide"),
	QMessageBox::ActionRole);
	QPushButton *abortButton = msgBox.addButton(QMessageBox::Cancel);

	Q_UNUSED(abortButton);

	msgBox.exec();

	if (msgBox.clickedButton() == hideButton) {
	return false;
	}
	else if (msgBox.clickedButton() == enableAndDenotifyButton) {
	settings()->setValue("options/disableHideAlert", true);
	applySettings();
	return false;
	}
	else if (msgBox.clickedButton() == enableButton) {
	settings()->setValue("options/tray", true);
	applySettings();
	return false;
	}

	return true; // Cancel
	}

	void LightscreenWindow::goToFolder()
	{
	#ifdef Q_WS_WIN
	if (!mLastScreenshot.isEmpty()) {
	QProcess::startDetached("explorer /select, \"" + mLastScreenshot +"\"");
	}
	else {
	#endif
	QString folder = settings()->value("file/target").toString();

	if (folder.isEmpty())
	folder = qApp->applicationDirPath();

	if (QDir::toNativeSeparators(folder.at(folder.size()-1)) != QDir::separator())
	folder.append(QDir::separator());

	QDesktopServices::openUrl("file:///"+folder);
	#ifdef Q_WS_WIN
	}
	#endif
	}

	void LightscreenWindow::messageClicked()
	{
	if (mLastMessage == 1) {
	goToFolder();
	}
	else {
	QDesktopServices::openUrl(QUrl(Uploader::instance()->lastUrl()));
	}
	}

	void LightscreenWindow::messageReceived(const QString &message)
	{
	if (message.contains(' ')) {
	foreach (QString argument, message.split(' ')) {
	messageReceived(argument);
	}
	}

	if (message == "--wake") {
	show();
	qApp->alert(this, 500);
	return;
	}

	if (message == "--screen")
	screenshotAction();
	else if (message == "--area")
	screenshotAction(2);
	else if (message == "--activewindow")
	screenshotAction(1);
	else if (message == "--pickwindow")
	screenshotAction(3);
	else if (message == "--folder")
	action(4);
	else if (message == "--uploadlast")
	uploadLast();
	else if (message == "--viewhistory")
	showHistoryDialog();
	}

	void LightscreenWindow::notify(const Screenshot::Result &result)
	{
	switch (result)
	{
	case Screenshot::Success:
	mTrayIcon->setIcon(QIcon(":/icons/lightscreen.yes"));

	#ifdef Q_WS_WIN
	if (mTaskbarButton)
	mTaskbarButton->SetOverlayIcon(QIcon(":/icons/yes"), tr("Success!"));
	#endif

	setWindowTitle(tr("Success!"));
	break;
	case Screenshot::Fail:
	mTrayIcon->setIcon(QIcon(":/icons/lightscreen.no"));
	setWindowTitle(tr("Failed!"));
	#ifdef Q_WS_WIN
	if (mTaskbarButton)
	mTaskbarButton->SetOverlayIcon(QIcon(":/icons/no"), tr("Failed!"));
	#endif
	break;
	case Screenshot::Cancel:
	setWindowTitle(tr("Cancelled!"));
	break;
	}

	QTimer::singleShot(2000, this, SLOT(restoreNotification()));
	}

	void LightscreenWindow::preview(Screenshot* screenshot)
	{
	if (screenshot->options().preview) {
	if (!mPreviewDialog) {
	mPreviewDialog = new PreviewDialog(this);
	}

	mPreviewDialog->add(screenshot);
	}
	else {
	screenshot->confirm(true);
	}
	}

	void LightscreenWindow::quit()
	{
	settings()->setValue("position", pos());

	int answer = 0;
	QString doing;

	if (ScreenshotManager::instance()->activeCount() > 0) {
	doing = tr("processing");
	}

	if (Uploader::instance()->uploading() > 0) {
	if (doing.isEmpty()) {
	doing = tr("uploading");
	}
	else {
	doing = tr("processing and uploading");
	}
	}

	if (!doing.isEmpty()) {
	answer = QMessageBox::question(this,
	tr("Are you sure you want to quit?"),
	tr("Lightscreen is currently %1 screenshots. Are you sure you want to quit?").arg(doing),
	tr("Quit"),
	tr("Don't Quit"));
	}

	if (answer == 0)
	emit finished();
	}

	void LightscreenWindow::restoreNotification()
	{
	if (mTrayIcon)
	mTrayIcon->setIcon(QIcon(":/icons/lightscreen.small"));

	#ifdef Q_WS_WIN
	if (mTaskbarButton)
	mTaskbarButton->SetOverlayIcon(QIcon(), "");
	#endif

	updateUploadStatus();
	}

	void LightscreenWindow::screenshotAction(int mode)
	{
	int delayms = -1;

	bool optionsHide = settings()->value("options/hide").toBool(); // Option cache, used a couple of times.

	if (!mHideTrigger) {
	mWasVisible = isVisible();
	mHideTrigger = true;
	}

	// Applying pre-screenshot settings
	if (optionsHide) {
	hide();

	#ifndef Q_WS_X11 // X is not quick enough and the notification ends up everywhere but in the icon
	if (mTrayIcon)
	mTrayIcon->hide();
	#endif
	}

	// Screenshot delay
	delayms = settings()->value("options/delay", 0).toInt();
	delayms = delayms * 1000; // Converting the delay to milliseconds.

	delayms += 400;

	if (optionsHide && mPreviewDialog) {
	if (mPreviewDialog->count() >= 1) {
	mPreviewDialog->hide();
	}
	}

	// The delayed functions works using the static variable lastMode
	// which keeps the argument so a QTimer can call this function again.
	if (delayms > 0) {
	if (mLastMode < 0) {
	mLastMode = mode;

	QTimer::singleShot(delayms, this, SLOT(screenshotAction()));
	return;
	}
	else {
	mode = mLastMode;
	mLastMode = -1;
	}
	}

	static Screenshot::Options options;

	if (!mDoCache) {
	// Populating the option object that will then be passed to the screenshot engine (sounds fancy huh?)
	options.file = settings()->value("file/enabled").toBool();
	options.format = (Screenshot::Format) settings()->value("file/format").toInt();
	options.prefix = settings()->value("file/prefix").toString();

	QDir dir(settings()->value("file/target").toString());
	dir.makeAbsolute();

	options.directory = dir;

	options.quality = settings()->value("options/quality", 100).toInt();
	options.currentMonitor = settings()->value("options/currentMonitor", false).toBool();
	options.clipboard = settings()->value("options/clipboard", true).toBool();
	options.imgurClipboard = settings()->value("options/imgurClipboard", false).toBool();
	options.preview = settings()->value("options/preview", false).toBool();
	options.magnify = settings()->value("options/magnify", false).toBool();
	options.cursor = settings()->value("options/cursor", false).toBool();
	options.saveAs = settings()->value("options/saveAs", false).toBool();
	options.animations = settings()->value("options/animations", true).toBool();
	options.replace = settings()->value("options/replace", false).toBool();
	options.upload = settings()->value("options/uploadAuto", false).toBool();
	options.optimize = settings()->value("options/optipng", false).toBool();

	Screenshot::NamingOptions namingOptions;
	namingOptions.naming = (Screenshot::Naming) settings()->value("file/naming").toInt();
	namingOptions.leadingZeros = settings()->value("options/naming/leadingZeros", 0).toInt();
	namingOptions.flip = settings()->value("options/flip", false).toBool();
	namingOptions.dateFormat = settings()->value("options/naming/dateFormat", "yyyy-MM-dd").toString();

	options.namingOptions = namingOptions;

	mDoCache = true;
	}

	options.mode = mode;

	ScreenshotManager::instance()->take(options);
	}

	void LightscreenWindow::screenshotActionTriggered(QAction* action)
	{
	screenshotAction(action->data().toInt());
	}

	void LightscreenWindow::showHotkeyError(const QStringList &hotkeys)
	{
	static bool dontShow = false;

	if (dontShow)
	return;

	QString messageText;

	messageText = tr("Some hotkeys could not be registered, they might already be in use");

	if (hotkeys.count() > 1) {
	messageText += tr("<br>The failed hotkeys are the following:") + "<ul>";

	foreach(const QString &hotkey, hotkeys) {
	messageText += QString("%1%2%3").arg("<li><b>").arg(hotkey).arg("</b></li>");
	}

	messageText += "</ul>";
	}
	else {
	messageText += tr("<br>The failed hotkey is <b>%1</b>").arg(hotkeys[0]);
	}

	messageText += tr("<br><i>What do you want to do?</i>");

	QMessageBox msgBox(this);
	msgBox.setWindowTitle(tr("Lightscreen"));
	msgBox.setText(messageText);

	QPushButton *changeButton = msgBox.addButton(tr("Change") , QMessageBox::ActionRole);
	QPushButton *disableButton = msgBox.addButton(tr("Disable"), QMessageBox::ActionRole);
	QPushButton *exitButton = msgBox.addButton(tr("Quit") , QMessageBox::ActionRole);

	msgBox.exec();

	if (msgBox.clickedButton() == exitButton) {
	dontShow = true;
	QTimer::singleShot(10, this, SLOT(quit()));
	}
	else if (msgBox.clickedButton() == changeButton) {
	showOptions();
	}
	else if (msgBox.clickedButton() == disableButton) {
	foreach(const QString &hotkey, hotkeys) {
	settings()->setValue(QString("actions/%1/enabled").arg(hotkey), false);
	}
	}
	}

	void LightscreenWindow::showHistoryDialog()
	{
	HistoryDialog historyDialog(this);
	historyDialog.exec();

	updateUploadStatus();
	}

	void LightscreenWindow::showOptions()
	{
	GlobalShortcutManager::clear();

	QPointer<OptionsDialog> optionsDialog = new OptionsDialog(this);

	optionsDialog->exec();
	optionsDialog->deleteLater();

	applySettings();
	}


	void LightscreenWindow::showUploadMenu()
	{
	QMenu* imgurMenu = new QMenu(tr("Upload"));

	QAction *uploadAction = new QAction(QIcon(":/icons/imgur"), tr("&Upload last"), imgurMenu);
	uploadAction->setToolTip(tr("Upload the last screenshot you took to imgur.com"));
	connect(uploadAction, SIGNAL(triggered()), this, SLOT(uploadLast()));

	QAction *cancelAction = new QAction(QIcon(":/icons/no"), tr("&Cancel upload"), imgurMenu);
	cancelAction->setToolTip(tr("Cancel the currently uploading screenshots"));
	cancelAction->setEnabled(false);
	connect(this, SIGNAL(uploading(bool)), cancelAction, SLOT(setEnabled(bool)));
	connect(cancelAction, SIGNAL(triggered()), this, SLOT(uploadCancel()));

	QAction *historyAction = new QAction(QIcon(":/icons/view-history"), tr("View &History"), imgurMenu);
	connect(historyAction, SIGNAL(triggered()), this, SLOT(showHistoryDialog()));

	imgurMenu->addAction(uploadAction);
	imgurMenu->addAction(cancelAction);
	imgurMenu->addAction(historyAction);
	imgurMenu->addSeparator();

	ui.imgurPushButton->setMenu(imgurMenu);
	ui.imgurPushButton->showMenu();
	}


	void LightscreenWindow::showScreenshotMessage(const Screenshot::Result &result, const QString &fileName)
	{
	if (result == Screenshot::Cancel
	\|\| mPreviewDialog)
	return;

	// Showing message.
	QString title;
	QString message;

	if (result == Screenshot::Success) {
	title = QFileInfo(fileName).fileName();

	if (settings()->value("file/target").toString().isEmpty()) {
	message = QDir::toNativeSeparators(QCoreApplication::applicationDirPath());
	}
	else {
	message = tr("Saved to \"%1\"").arg(settings()->value("file/target").toString());
	}
	}
	else {
	title = tr("The screenshot was not taken");
	message = tr("An error occurred.");
	}

	mLastMessage = 1;
	mTrayIcon->showMessage(title, message);
	}

	void LightscreenWindow::showUploaderError(const QString &error)
	{
	mLastMessage = -1;

	if (mTrayIcon && !error.isEmpty()) {
	mTrayIcon->showMessage(tr("Upload error"), error);
	}

	updateUploadStatus();
	}

	void LightscreenWindow::showUploaderMessage(QString fileName, QString url)
	{
	if (!mTrayIcon)
	return;

	QString screenshot = QFileInfo(fileName).fileName();

	if (screenshot.startsWith(".lstemp."))
	screenshot = tr("Screenshot");

	mLastMessage = 2;
	mTrayIcon->showMessage(tr("%1 uploaded").arg(screenshot), tr("Click here to go to %1").arg(url));
	updateUploadStatus();
	}

	void LightscreenWindow::toggleVisibility(QSystemTrayIcon::ActivationReason reason)
	{
	if (reason != QSystemTrayIcon::DoubleClick)
	return;

	if (isVisible()) {
	if (settings()->value("options/tray").toBool() == false
	&& closingWithoutTray())
	return;

	hide();
	}
	else {
	show();
	}
	}

	void LightscreenWindow::updateUploadStatus()
	{
	int uploadCount = Uploader::instance()->uploading();
	QString statusString;

	if (uploadCount > 0) {
	- statusString = tr("Uploading %1 screenshot(s)").arg(uploadCount);
	+ statusString = tr("%1 uploading - Lightscreen").arg(uploadCount);
	+ ui.imgurPushButton->setIcon(QIcon(":/icons/imgur.upload"));
	emit uploading(true);
	}
	else {
	statusString = tr("Lightscreen");
	+ ui.imgurPushButton->setIcon(QIcon(":/icons/imgur"));
	emit uploading(false);

	#ifdef Q_WS_WIN
	if (mTaskbarButton) {
	mTaskbarButton->SetProgresValue(0, 0);
	mTaskbarButton->SetState(STATE_NOPROGRESS);
	}
	#endif
	}

	if (mTrayIcon) {
	mTrayIcon->setToolTip(statusString);
	}

	setWindowTitle(statusString);
	}

	void LightscreenWindow::updaterDone(bool result)
	{
	settings()->setValue("lastUpdateCheck", QDate::currentDate().dayOfYear());

	if (!result)
	return;

	QMessageBox msgBox;
	msgBox.setWindowTitle(tr("Lightscreen"));
	msgBox.setText(tr("There's a new version of Lightscreen available.<br>Would you like to see more information?<br>(<em>You can turn this notification off</em>)"));
	msgBox.setIcon(QMessageBox::Information);

	QPushButton *yesButton = msgBox.addButton(QMessageBox::Yes);
	QPushButton *turnOffButton = msgBox.addButton(tr("Turn Off"), QMessageBox::ActionRole);
	QPushButton *remindButton = msgBox.addButton(tr("Remind Me Later"), QMessageBox::RejectRole);

	Q_UNUSED(remindButton);

	msgBox.exec();

	if (msgBox.clickedButton() == yesButton) {
	QDesktopServices::openUrl(QUrl("http://lightscreen.sourceforge.net/whatsnew/?from=" + qApp->applicationVersion()));
	}
	else if (msgBox.clickedButton() == turnOffButton) {
	settings()->setValue("options/disableUpdater", true);
	}
	}

	void LightscreenWindow::upload(const QString &fileName)
	{
	Uploader::instance()->upload(fileName);
	}

	void LightscreenWindow::uploadCancel()
	{
	if (Uploader::instance()->uploading() <= 0) {
	return;
	}

	int confirm = QMessageBox::question(this, tr("Upload cancel"), tr("Do you want to cancel all screenshot uploads?"), tr("Cancel"), tr("Don't Cancel"));

	if (confirm == 0) {
	Uploader::instance()->cancel();
	updateUploadStatus();
	}
	}

	void LightscreenWindow::uploadLast()
	{
	upload(mLastScreenshot);
	updateUploadStatus();
	}

	void LightscreenWindow::uploadProgress(qint64 sent, qint64 total)
	{
	#ifdef Q_WS_WIN
	if (mTaskbarButton)
	mTaskbarButton->SetProgresValue(sent, total);
	+
	+ if (isVisible()) {
	+ int uploadCount = Uploader::instance()->uploading();
	+ int progress = (sent*100)/total;
	+
	+ if (uploadCount > 1) {
	+ setWindowTitle(tr("%1% of %2 uploads - Lightscreen").arg(progress).arg(uploadCount));
	+ }
	+ else {
	+ setWindowTitle(tr("%1% - Lightscreen").arg(progress));
	+ }
	+ }
	#endif
	- //TODO: Update mTrayIcon & windowTitle()
	}

	void LightscreenWindow::windowHotkey()
	{
	screenshotAction(1);
	}

	void LightscreenWindow::windowPickerHotkey()
	{
	screenshotAction(3);
	}

	//

	void LightscreenWindow::applySettings()
	{
	bool tray = settings()->value("options/tray").toBool();

	if (tray && !mTrayIcon) {
	createTrayIcon();
	mTrayIcon->show();
	}
	else if (!tray && mTrayIcon) {
	mTrayIcon->deleteLater();
	}

	connectHotkeys();

	mDoCache = false;

	if (settings()->value("lastScreenshot").isValid())
	mLastScreenshot = settings()->value("lastScreenshot").toString();

	os::setStartup(settings()->value("options/startup").toBool(), settings()->value("options/startupHide").toBool());
	}

	//


	void LightscreenWindow::connectHotkeys()
	{
	// Set to true because if the hotkey is disabled it will show an error.
	bool screen = true, area = true, window = true, windowPicker = true, open = true, directory = true;

	if (settings()->value("actions/screen/enabled").toBool())
	screen = GlobalShortcutManager::instance()->connect(settings()->value(
	"actions/screen/hotkey").value<QKeySequence> (), this, SLOT(screenshotAction()));

	if (settings()->value("actions/area/enabled").toBool())
	area = GlobalShortcutManager::instance()->connect(settings()->value(
	"actions/area/hotkey").value<QKeySequence> (), this, SLOT(areaHotkey()));

	if (settings()->value("actions/window/enabled").toBool())
	window = GlobalShortcutManager::instance()->connect(settings()->value(
	"actions/window/hotkey").value<QKeySequence> (), this, SLOT(windowHotkey()));

	if (settings()->value("actions/windowPicker/enabled").toBool())
	windowPicker = GlobalShortcutManager::instance()->connect(settings()->value(
	"actions/windowPicker/hotkey").value<QKeySequence> (), this, SLOT(windowPickerHotkey()));

	if (settings()->value("actions/open/enabled").toBool())
	open = GlobalShortcutManager::instance()->connect(settings()->value(
	"actions/open/hotkey").value<QKeySequence> (), this, SLOT(show()));

	if (settings()->value("actions/directory/enabled").toBool())
	directory = GlobalShortcutManager::instance()->connect(settings()->value(
	"actions/directory/hotkey").value<QKeySequence> (), this, SLOT(goToFolder()));

	QStringList failed;
	if (!screen) failed << "screen";
	if (!area) failed << "area";
	if (!window) failed << "window";
	if (!windowPicker) failed << "window picker";
	if (!open) failed << "open";
	if (!directory) failed << "directory";

	if (!failed.isEmpty())
	showHotkeyError(failed);
	}

	void LightscreenWindow::createTrayIcon()
	{
	mTrayIcon = new QSystemTrayIcon(QIcon(":/icons/lightscreen.small"), this);
	updateUploadStatus();

	connect(mTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleVisibility(QSystemTrayIcon::ActivationReason)));
	connect(mTrayIcon, SIGNAL(messageClicked()), this, SLOT(messageClicked()));

	QAction *hideAction = new QAction(QIcon(":/icons/lightscreen.small"), tr("Show&/Hide"), mTrayIcon);
	connect(hideAction, SIGNAL(triggered()), this, SLOT(toggleVisibility()));

	QAction *screenAction = new QAction(QIcon(":/icons/screen"), tr("&Screen"), mTrayIcon);
	screenAction->setData(QVariant(0));

	QAction *windowAction = new QAction(QIcon(":/icons/window"), tr("Active &Window"), this);
	windowAction->setData(QVariant(1));

	QAction *windowPickerAction = new QAction(QIcon(":/icons/picker"), tr("&Pick Window"), this);
	windowPickerAction->setData(QVariant(3));

	QAction *areaAction = new QAction(QIcon(":/icons/area"), tr("&Area"), mTrayIcon);
	areaAction->setData(QVariant(2));

	QActionGroup *screenshotGroup = new QActionGroup(mTrayIcon);
	screenshotGroup->addAction(screenAction);
	screenshotGroup->addAction(areaAction);
	screenshotGroup->addAction(windowAction);
	screenshotGroup->addAction(windowPickerAction);

	connect(screenshotGroup, SIGNAL(triggered(QAction)), this, SLOT(screenshotActionTriggered(QAction)));

	// Duplicated for the screenshot button :(
	QAction *uploadAction = new QAction(QIcon(":/icons/imgur"), tr("&Upload last"), mTrayIcon);
	uploadAction->setToolTip(tr("Upload the last screenshot you took to imgur.com"));
	connect(uploadAction, SIGNAL(triggered()), this, SLOT(uploadLast()));

	QAction *cancelAction = new QAction(QIcon(":/icons/no"), tr("&Cancel upload"), mTrayIcon);
	cancelAction->setToolTip(tr("Cancel the currently uploading screenshots"));
	cancelAction->setEnabled(false);
	connect(this, SIGNAL(uploading(bool)), cancelAction, SLOT(setEnabled(bool)));
	connect(cancelAction, SIGNAL(triggered()), this, SLOT(uploadCancel()));

	QAction *historyAction = new QAction(QIcon(":/icons/view-history"), tr("View History"), mTrayIcon);
	connect(historyAction, SIGNAL(triggered()), this, SLOT(showHistoryDialog()));
	//

	QAction *optionsAction = new QAction(QIcon(":/icons/configure"), tr("View &Options"), mTrayIcon);
	connect(optionsAction, SIGNAL(triggered()), this, SLOT(showOptions()));

	QAction *goAction = new QAction(QIcon(":/icons/folder"), tr("&Go to Folder"), mTrayIcon);
	connect(goAction, SIGNAL(triggered()), this, SLOT(goToFolder()));

	QAction *quitAction = new QAction(tr("&Quit"), mTrayIcon);
	connect(quitAction, SIGNAL(triggered()), this, SLOT(quit()));

	QMenu* screenshotMenu = new QMenu(tr("Screenshot"));
	screenshotMenu->addAction(screenAction);
	screenshotMenu->addAction(areaAction);
	screenshotMenu->addAction(windowAction);
	screenshotMenu->addAction(windowPickerAction);

	// Duplicated for the screenshot button :(
	QMenu* imgurMenu = new QMenu(tr("Upload"));
	imgurMenu->addAction(uploadAction);
	imgurMenu->addAction(cancelAction);
	imgurMenu->addAction(historyAction);
	imgurMenu->addSeparator();

	QMenu* trayIconMenu = new QMenu;
	trayIconMenu->addAction(hideAction);
	trayIconMenu->addSeparator();
	trayIconMenu->addMenu(imgurMenu);
	trayIconMenu->addSeparator();
	trayIconMenu->addMenu(screenshotMenu);
	trayIconMenu->addAction(optionsAction);
	trayIconMenu->addAction(goAction);
	trayIconMenu->addSeparator();
	trayIconMenu->addAction(quitAction);

	mTrayIcon->setContextMenu(trayIconMenu);
	}

	#ifdef Q_WS_WIN
	bool LightscreenWindow::winEvent(MSG message, long result)
	{
	Taskbar::GetInstance()->winEvent(message, result);
	return false;
	}
	#endif

	QSettings *LightscreenWindow::settings() const
	{
	return ScreenshotManager::instance()->settings();
	}

	// Event handling
	bool LightscreenWindow::event(QEvent *event)
	{
	if (event->type() == QEvent::Hide) {
	settings()->setValue("position", pos());
	}
	else if (event->type() == QEvent::Close) {
	quit();
	}
	else if (event->type() == QEvent::Show) {
	if (!settings()->value("position").toPoint().isNull())
	move(settings()->value("position").toPoint());
	}
	else if (event->type() == QEvent::KeyPress) {
	QKeyEvent keyEvent = static_cast<QKeyEvent>(event);
	#ifdef Q_WS_MAC
	if (keyEvent->modifiers() == Qt::ControlModifier && e->key() == Qt::Key_Period) {
	keyEvent->ignore();

	if(isVisible())
	toggleVisibility();

	return false;
	}
	else
	#endif
	if (!keyEvent->modifiers() && keyEvent->key() == Qt::Key_Escape) {
	keyEvent->ignore();

	if(isVisible())
	toggleVisibility();

	return false;
	}
	}
	else if (event->type() == QEvent::LanguageChange) {
	ui.retranslateUi(this);
	resize(minimumSizeHint());
	}


	return QMainWindow::event(event);
	}
	diff --git a/lightscreenwindow.ui b/lightscreenwindow.ui
	index 75a66cb..f04e05e 100644
	--- a/lightscreenwindow.ui
	+++ b/lightscreenwindow.ui
	@@ -1,204 +1,243 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<ui version="4.0">
	<class>LightscreenWindowClass</class>
	<widget class="QMainWindow" name="LightscreenWindowClass">
	<property name="geometry">
	<rect>
	<x>0</x>
	<y>0</y>
	- <width>271</width>
	- <height>113</height>
	+ <width>262</width>
	+ <height>115</height>
	</rect>
	</property>
	<property name="sizePolicy">
	<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="windowTitle">
	<string>Lightscreen</string>
	</property>
	<property name="windowIcon">
	<iconset resource="lightscreen.qrc">
	- <normaloff>:/icons/lightscreen.small</normaloff>:/icons/lightscreen.small</iconset>
	+ <normaloff>:/icons/lightscreen</normaloff>:/icons/lightscreen</iconset>
	</property>
	<property name="animated">
	<bool>false</bool>
	</property>
	<property name="unifiedTitleAndToolBarOnMac">
	<bool>true</bool>
	</property>
	<widget class="QWidget" name="centralwidget">
	<layout class="QGridLayout" name="gridLayout">
	<property name="margin">
	- <number>4</number>
	+ <number>3</number>
	</property>
	<property name="spacing">
	- <number>4</number>
	+ <number>2</number>
	</property>
	- <item row="0" column="0">
	- <widget class="QPushButton" name="screenPushButton">
	- <property name="minimumSize">
	- <size>
	- <width>24</width>
	- <height>24</height>
	- </size>
	- </property>
	- <property name="text">
	- <string/>
	- </property>
	- <property name="icon">
	- <iconset resource="lightscreen.qrc">
	- <normaloff>:/icons/screen</normaloff>:/icons/screen</iconset>
	- </property>
	- <property name="iconSize">
	- <size>
	- <width>64</width>
	- <height>64</height>
	- </size>
	- </property>
	- <property name="autoDefault">
	- <bool>false</bool>
	- </property>
	- <property name="flat">
	- <bool>false</bool>
	- </property>
	- </widget>
	- </item>
	<item row="0" column="1">
	<widget class="QPushButton" name="areaPushButton">
	<property name="minimumSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	+ <property name="toolTip">
	+ <string>Area capture</string>
	+ </property>
	+ <property name="whatsThis">
	+ <string>Capture a specific area of your desktop, resize and move it around!</string>
	+ </property>
	<property name="text">
	<string/>
	</property>
	<property name="icon">
	<iconset resource="lightscreen.qrc">
	- <normaloff>:/icons/area</normaloff>:/icons/area</iconset>
	+ <normaloff>:/icons/area.big</normaloff>:/icons/area.big</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>64</width>
	<height>64</height>
	</size>
	</property>
	+ <property name="shortcut">
	+ <string>Ctrl+A</string>
	+ </property>
	<property name="autoDefault">
	<bool>false</bool>
	</property>
	<property name="flat">
	<bool>false</bool>
	</property>
	</widget>
	</item>
	<item row="0" column="2">
	<widget class="QPushButton" name="windowPushButton">
	<property name="minimumSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	+ <property name="toolTip">
	+ <string>Pick window</string>
	+ </property>
	+ <property name="whatsThis">
	+ <string>Drop the picker onto a window to capture it.</string>
	+ </property>
	<property name="icon">
	<iconset resource="lightscreen.qrc">
	- <normaloff>:/icons/picker</normaloff>:/icons/picker</iconset>
	+ <normaloff>:/icons/picker.big</normaloff>:/icons/picker.big</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>64</width>
	<height>64</height>
	</size>
	</property>
	+ <property name="shortcut">
	+ <string>Ctrl+P</string>
	+ </property>
	<property name="autoDefault">
	<bool>false</bool>
	</property>
	<property name="flat">
	<bool>false</bool>
	</property>
	</widget>
	</item>
	<item row="1" column="0">
	<widget class="QPushButton" name="optionsPushButton">
	<property name="minimumSize">
	<size>
	<width>0</width>
	<height>26</height>
	</size>
	</property>
	<property name="toolTip">
	<string>Configure Lightscreen</string>
	</property>
	<property name="text">
	<string>&Options</string>
	</property>
	<property name="icon">
	<iconset resource="lightscreen.qrc">
	<normaloff>:/icons/configure</normaloff>:/icons/configure</iconset>
	</property>
	+ <property name="shortcut">
	+ <string>Ctrl+O</string>
	+ </property>
	<property name="autoDefault">
	<bool>false</bool>
	</property>
	<property name="flat">
	<bool>false</bool>
	</property>
	</widget>
	</item>
	<item row="1" column="1">
	<widget class="QPushButton" name="folderPushButton">
	<property name="minimumSize">
	<size>
	<width>0</width>
	<height>26</height>
	</size>
	</property>
	+ <property name="toolTip">
	+ <string>Open the current Screenshot folder</string>
	+ </property>
	<property name="text">
	<string>&Folder</string>
	</property>
	<property name="icon">
	<iconset resource="lightscreen.qrc">
	<normaloff>:/icons/folder</normaloff>:/icons/folder</iconset>
	</property>
	+ <property name="shortcut">
	+ <string>Ctrl+F</string>
	+ </property>
	<property name="autoDefault">
	<bool>false</bool>
	</property>
	<property name="flat">
	<bool>false</bool>
	</property>
	</widget>
	</item>
	<item row="1" column="2">
	<widget class="QPushButton" name="imgurPushButton">
	<property name="minimumSize">
	<size>
	<width>0</width>
	<height>26</height>
	</size>
	</property>
	+ <property name="toolTip">
	+ <string>Imgur upload controls</string>
	+ </property>
	<property name="text">
	<string>&Upload</string>
	</property>
	<property name="icon">
	<iconset resource="lightscreen.qrc">
	<normaloff>:/icons/imgur</normaloff>:/icons/imgur</iconset>
	</property>
	+ <property name="shortcut">
	+ <string>Ctrl+U</string>
	+ </property>
	+ <property name="autoDefault">
	+ <bool>false</bool>
	+ </property>
	+ <property name="flat">
	+ <bool>false</bool>
	+ </property>
	+ </widget>
	+ </item>
	+ <item row="0" column="0">
	+ <widget class="QPushButton" name="screenPushButton">
	+ <property name="minimumSize">
	+ <size>
	+ <width>24</width>
	+ <height>24</height>
	+ </size>
	+ </property>
	+ <property name="toolTip">
	+ <string>Fullscreen capture</string>
	+ </property>
	+ <property name="whatsThis">
	+ <string>Take a screenshot of your entire desktop.</string>
	+ </property>
	+ <property name="icon">
	+ <iconset resource="lightscreen.qrc">
	+ <normaloff>:/icons/sceen.big</normaloff>:/icons/sceen.big</iconset>
	+ </property>
	+ <property name="iconSize">
	+ <size>
	+ <width>64</width>
	+ <height>64</height>
	+ </size>
	+ </property>
	+ <property name="shortcut">
	+ <string>Ctrl+S</string>
	+ </property>
	<property name="autoDefault">
	<bool>false</bool>
	</property>
	<property name="flat">
	<bool>false</bool>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	</widget>
	<layoutdefault spacing="6" margin="11"/>
	<resources>
	<include location="lightscreen.qrc"/>
	</resources>
	<connections/>
	</ui>
	diff --git a/tools/qtimgur.cpp b/tools/qtimgur.cpp
	index ef66dc6..76bf4b3 100644
	--- a/tools/qtimgur.cpp
	+++ b/tools/qtimgur.cpp
	@@ -1,149 +1,158 @@
	/*
	* Copyright (C) 2011 Christian Kaiser
	*
	* 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 library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*
	*/
	#include "qtimgur.h"

	#include <QFile>
	#include <QNetworkAccessManager>
	#include <QNetworkReply>
	#include <QNetworkRequest>
	#include <QXmlStreamReader>

	#include <QDebug>

	QtImgur::QtImgur(const QString &APIKey, QObject *parent) : QObject(parent), mAPIKey(APIKey)
	{
	mNetworkManager = new QNetworkAccessManager(this);

	connect(mNetworkManager, SIGNAL(finished(QNetworkReply)), this, SLOT(reply(QNetworkReply)));
	}

	void QtImgur::cancelAll()
	{
	foreach (QNetworkReply *reply, mFiles.keys()) {
	reply->abort();
	mFiles.remove(reply);
	}
	}

	void QtImgur::cancel(const QString &fileName)
	{
	QNetworkReply *reply = mFiles.key(fileName);

	if (!reply) {
	return;
	}

	mFiles.remove(reply);
	reply->abort();
	}

	void QtImgur::upload(const QString &fileName)
	{
	QFile file(fileName);

	if (!file.open(QIODevice::ReadOnly)) {
	emit error(fileName, QtImgur::ErrorFile);
	return;
	}

	QByteArray image = file.readAll().toBase64();

	file.close();

	QByteArray data;
	data.append(QString("key=").toUtf8());
	data.append(QUrl::toPercentEncoding(mAPIKey));
	+ data.append(QString("&caption=").toUtf8());
	+ data.append(QUrl::toPercentEncoding(tr("Screenshot taken with Lightscreen - http://lightscreen.sf.net")));
	data.append(QString("&image=").toUtf8());
	data.append(QUrl::toPercentEncoding(image));

	QNetworkRequest request(QUrl("http://api.imgur.com/2/upload"));
	request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");

	QNetworkReply *reply = mNetworkManager->post(request, data);
	connect(reply, SIGNAL(uploadProgress(qint64, qint64)), this, SLOT(progress(qint64, qint64)));
	connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(replyError(QNetworkReply::NetworkError)));

	mFiles.insert(reply, fileName);
	}

	void QtImgur::progress(qint64 bytesSent, qint64 bytesTotal)
	{
	qint64 totalSent, totalTotal;

	QNetworkReply senderReply = qobject_cast<QNetworkReply>(sender());

	senderReply->setProperty("bytesSent", bytesSent);
	senderReply->setProperty("bytesTotal", bytesTotal);

	totalSent = bytesSent;
	totalTotal = bytesTotal;

	foreach (QNetworkReply *reply, mFiles.keys()) {
	if (reply != senderReply) {
	totalSent += reply->property("bytesSent").toLongLong();
	totalTotal += reply->property("bytesTotal").toLongLong();
	}
	}

	emit uploadProgress(totalSent, totalTotal);
	}

	void QtImgur::reply(QNetworkReply *reply)
	{
	QString fileName = mFiles[reply];

	mFiles.remove(reply);

	if (reply->error() == QNetworkReply::OperationCanceledError) {
	qDebug() << "Error: " << reply->errorString();
	emit error(fileName, QtImgur::ErrorCancel);
	return;
	}

	if (reply->rawHeader("X-RateLimit-Remaining") == "0") {

	emit error(fileName, QtImgur::ErrorCredits);
	return;
	}

	QXmlStreamReader reader(reply->readAll());
	+ QString url;
	+ QString deleteHash;

	while (!reader.atEnd()) {
	reader.readNext();

	if (reader.isStartElement()) {
	if (reader.name() == "error") {
	qDebug() << "Error: " << reply->errorString();
	emit error(fileName, QtImgur::ErrorUpload);
	}

	+ if (reader.name() == "deletehash") {
	+ deleteHash = reader.readElementText();
	+ }
	+
	if (reader.name() == "imgur_page") {
	- QString url = reader.readElementText();
	- emit uploaded(fileName, url);
	+ url = reader.readElementText();
	}
	}
	}

	+ emit uploaded(fileName, url, deleteHash);
	+
	reply->deleteLater();
	}

	void QtImgur::replyError(QNetworkReply::NetworkError networkError) {
	Q_UNUSED(networkError)
	emit error(mFiles.value(qobject_cast<QNetworkReply*>(sender())), QtImgur::ErrorNetwork);
	}
	diff --git a/tools/qtimgur.h b/tools/qtimgur.h
	index f591cc0..7cbff93 100644
	--- a/tools/qtimgur.h
	+++ b/tools/qtimgur.h
	@@ -1,63 +1,63 @@
	/*
	* Copyright (C) 2011 Christian Kaiser
	*
	* 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 library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*
	*/
	#ifndef QTIMGUR_H
	#define QTIMGUR_H

	#include <QObject>
	#include <QHash>
	#include <QNetworkReply>

	class QNetworkAccessManager;

	class QtImgur: public QObject {
	Q_OBJECT

	public:
	enum Error {
	ErrorFile,
	ErrorNetwork,
	ErrorCredits,
	ErrorUpload,
	ErrorCancel
	};

	QtImgur(const QString &APIKey, QObject *parent);

	public slots:
	void cancelAll();
	void cancel(const QString &fileName);
	void upload(const QString &fileName);

	protected slots:
	void progress(qint64, qint64);
	void reply(QNetworkReply* reply);
	void replyError(QNetworkReply::NetworkError networkError);

	signals:
	void error(QString, QtImgur::Error);
	void uploadProgress(qint64, qint64);
	- void uploaded(QString file, QString url);
	+ void uploaded(QString file, QString url, QString deleteHash);

	private:
	QString mAPIKey;
	QNetworkAccessManager *mNetworkManager;
	QHash<QNetworkReply*, QString> mFiles;
	};

	#endif // QTIMGUR_H
	diff --git a/tools/screenshot.cpp b/tools/screenshot.cpp
	index 9b5917c..91357e2 100644
	--- a/tools/screenshot.cpp
	+++ b/tools/screenshot.cpp
	@@ -1,531 +1,513 @@
	/*
	* Copyright (C) 2011 Christian Kaiser
	*
	* 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 library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*
	*/
	#include <QApplication>
	#include <QClipboard>
	#include <QDateTime>
	#include <QDesktopWidget>
	#include <QFileDialog>
	#include <QPainter>
	#include <QPixmap>
	#include <QProcess>

	#include <QDebug>

	#include "windowpicker.h"
	#include "../dialogs/areadialog.h"
	#include "uploader.h"
	#include "screenshot.h"
	#include "screenshotmanager.h"

	#include "os.h"

	#ifdef Q_WS_WIN
	#include <windows.h>
	#endif

	#ifdef Q_WS_X11
	#include <QX11Info>
	#include <X11/X.h>
	#include <X11/Xlib.h>
	#endif

	Screenshot::Screenshot(QObject *parent, Screenshot::Options options):
	QObject(parent),
	mOptions(options),
	mPixmapDelay(false),
	mUnloaded(false),
	mUnloadFilename()
	{
	// Here be crickets
	}

	Screenshot::~Screenshot()
	{
	qDebug() << "Deleting Screenshot object!";

	if (!mUnloadFilename.isEmpty()) {
	QFile::remove(mUnloadFilename);
	}
	}

	QString Screenshot::getName(NamingOptions options, QString prefix, QDir directory)
	{
	QString naming;
	int naming_largest = 0;

	if (options.flip) {
	naming = "%1" + prefix;
	}
	else {
	naming = prefix + "%1";
	}

	switch (options.naming)
	{
	case Screenshot::Numeric: // Numeric
	// Iterating through the folder to find the largest numeric naming.
	foreach(QString file, directory.entryList(QDir::Files))
	{
	if (file.contains(prefix)) {
	file.chop(file.size() - file.lastIndexOf("."));
	file.remove(prefix);

	if (file.toInt()> naming_largest) {
	naming_largest = file.toInt();
	}
	}
	}

	if (options.leadingZeros > 0) {
	//Pretty, huh?
	QString format;
	QTextStream (&format) << "%0" << (options.leadingZeros+1) << "d";

	naming = naming.arg(QString().sprintf(format.toAscii(), naming_largest + 1));
	}
	else {
	naming = naming.arg(naming_largest + 1);
	}
	break;
	case Screenshot::Date: // Date
	naming = naming.arg(QLocale().toString(QDateTime::currentDateTime(), options.dateFormat));
	break;
	case Screenshot::Timestamp: // Timestamp
	naming = naming.arg(QDateTime::currentDateTime().toTime_t());
	break;
	case Screenshot::Empty:
	naming = naming.arg("");
	break;
	}

	return naming;
	}

	QString& Screenshot::unloadedFileName()
	{
	return mUnloadFilename;
	}

	Screenshot::Options &Screenshot::options()
	{
	return mOptions;
	}

	QPixmap &Screenshot::pixmap()
	{
	if (mUnloaded) {
	// A local reference.. what could go wrong? Nothing! Right guys? Guys?
	QPixmap p;
	p.load(mUnloadFilename);
	return p;
	}

	return mPixmap;
	}

	//

	void Screenshot::confirm(bool result)
	{
	qDebug() << "Screenshot::confirm(" << result << ")";

	if (result) {
	save();
	}
	else {
	mOptions.result = Screenshot::Cancel;
	emit finished();
	}

	emit cleanup();

	mPixmap = QPixmap();
	}

	void Screenshot::confirmation()
	{
	qDebug() << "Screenshot: Asking for confirmation.";
	emit askConfirmation();

	if (mOptions.file) {
	unloadPixmap();
	}
	}

	void Screenshot::discard()
	{
	- qDebug() << "Screenshot: Discarding";
	confirm(false);
	}

	void Screenshot::markUpload()
	{
	- qDebug() << "Screenshot: Marking the screenshot as an upload";
	mOptions.upload = true;
	}

	void Screenshot::optimize()
	{
	QProcess* process = new QProcess(this);

	- qDebug() << "Screenshot: Running optiPNG";
	-
	// Delete the QProcess once it's done.
	connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), this , SLOT(optimizationDone()));
	connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), process, SLOT(deleteLater()));

	QString optiPNG;

	#ifdef Q_OS_UNIX
	optiPNG = "optipng";
	#else
	optiPNG = qApp->applicationDirPath() + QDir::separator() + "optipng.exe";
	#endif

	if (!QFile::exists(optiPNG)) {
	- qDebug() << "OptiPNG not found!";
	emit optimizationDone();
	}

	process->start(optiPNG, QStringList() << mOptions.fileName);

	if (process->state() == QProcess::NotRunning) {
	- qDebug() << "OptiPNG failed to start!";
	emit optimizationDone();
	process->deleteLater();
	}
	}

	void Screenshot::optimizationDone()
	{
	- qDebug() << "Screenshot::optimizationDone";
	-
	if (mOptions.upload) {
	upload();
	}
	else {
	emit finished();
	}
	}

	void Screenshot::save()
	{
	- qDebug() << "Screenshot::save";
	-
	QString name = "";
	QString fileName = "";
	Screenshot::Result result = Screenshot::Fail;

	if (mOptions.file && !mOptions.saveAs) {
	name = newFileName();
	}
	else if (mOptions.file && mOptions.saveAs) {
	name = QFileDialog::getSaveFileName(0, tr("Save as.."), newFileName(), "*" + extension());
	-
	-
	}

	if (!mOptions.replace && QFile::exists(name+extension())) {
	// Ugly? You should see my wife!
	int count = 0;
	int cunt = 0;

	QString naming = QFileInfo(name).fileName();

	foreach(QString file, QFileInfo(name+extension()).dir().entryList(QDir::Files)) {
	if (file.contains(naming)) {
	file.remove(naming);
	file.remove(" (");
	file.remove(")");
	file.remove(extension());

	cunt = file.toInt();

	if (cunt > count) {
	count = cunt;
	}
	}
	}

	name = name + " (" + QString::number(count+1) + ")";
	}

	if (mOptions.clipboard && !(mOptions.upload && mOptions.imgurClipboard)) {
	qDebug() << "Setting the clipboard pixmap, unloaded:" << mUnloaded;

	if (mUnloaded) {
	mUnloaded = false;
	mPixmap = QPixmap(mUnloadFilename);
	}

	QApplication::clipboard()->setPixmap(mPixmap, QClipboard::Clipboard);

	if (!mOptions.file) {
	result = (Screenshot::Result)1;
	}
	}

	// In the following code I use (Screenshot::Result)1 instead of Screenshot::Success because of some weird issue with the X11 headers. //TODO
	if (mOptions.file) {
	fileName = name + extension();

	if (name.isEmpty()) {
	result = Screenshot::Cancel;
	}
	else if (mUnloaded) {
	result = (QFile::rename(mUnloadFilename, fileName)) ? (Screenshot::Result)1: Screenshot::Fail;
	}
	else if (mPixmap.save(fileName, 0, mOptions.quality)) {
	result = (Screenshot::Result)1;
	}
	else {
	result = Screenshot::Fail;
	}

	os::addToRecentDocuments(fileName);
	}

	mOptions.fileName = fileName;
	mOptions.result = result;

	if (!mOptions.result)
	emit finished();

	- qDebug() << "Screenshot::save, time to optimize or upload. File: " << mOptions.file;
	-
	if (mOptions.format == Screenshot::PNG && mOptions.optimize && mOptions.file) {
	if (!mOptions.upload) {
	ScreenshotManager::instance()->saveHistory(mOptions.fileName);
	}

	optimize();
	}
	else if (mOptions.upload) {
	upload();
	}
	else if (mOptions.file) {
	ScreenshotManager::instance()->saveHistory(mOptions.fileName);
	emit finished();
	}
	else {
	emit finished();
	}
	}

	void Screenshot::setPixmap(QPixmap pixmap)
	{
	mPixmap = pixmap;

	if (mPixmap.isNull()) {
	emit confirm(false);
	}
	else {
	confirmation();
	}
	}

	void Screenshot::take()
	{
	switch (mOptions.mode)
	{
	case Screenshot::WholeScreen:
	wholeScreen();
	break;

	case Screenshot::SelectedArea:
	selectedArea();
	break;

	case Screenshot::ActiveWindow:
	activeWindow();
	break;

	case Screenshot::SelectedWindow:
	selectedWindow();
	break;
	}

	if (mPixmapDelay)
	return;

	if (mPixmap.isNull()) {
	confirm(false);
	}
	else {
	confirmation();
	}
	}

	void Screenshot::upload()
	{
	- qDebug() << "Screenshot: upload -> " << mOptions.fileName;
	-
	- if (!mOptions.file) {
	- if (unloadPixmap())
	- Uploader::instance()->upload(mUnloadFilename);
	+ if (mOptions.file) {
	+ Uploader::instance()->upload(mOptions.fileName);
	+ }
	+ else if (unloadPixmap()) {
	+ Uploader::instance()->upload(mUnloadFilename);
	}
	else {
	- Uploader::instance()->upload(mOptions.fileName);
	+ emit finished();
	}
	}

	void Screenshot::uploadDone(QString url)
	{
	- qDebug() << "Screenshot: uploadDone!";
	-
	if (mOptions.imgurClipboard)
	QApplication::clipboard()->setText(url, QClipboard::Clipboard);

	emit finished();
	}

	//

	void Screenshot::activeWindow()
	{
	#ifdef Q_WS_WIN
	HWND fWindow = GetForegroundWindow();

	if (fWindow == NULL)
	return;

	if (fWindow == GetDesktopWindow()) {
	wholeScreen();
	return;
	}

	mPixmap = os::grabWindow(GetForegroundWindow());
	#endif

	#if defined(Q_WS_X11)
	Window focus;
	int revert;

	XGetInputFocus(QX11Info::display(), &focus, &revert);

	mPixmap = QPixmap::grabWindow(focus);
	#endif
	}

	QString Screenshot::extension() const
	{
	switch (mOptions.format) {
	case Screenshot::PNG:
	return ".png";
	break;
	case Screenshot::BMP:
	return ".bmp";
	break;
	case Screenshot::JPEG:
	default:
	return ".jpg";
	break;
	}
	}

	void Screenshot::grabDesktop()
	{
	QRect geometry;

	if (mOptions.currentMonitor) {
	geometry = qApp->desktop()->screenGeometry(QCursor::pos());
	}
	else {
	geometry = qApp->desktop()->geometry();
	}

	mPixmap = QPixmap::grabWindow(qApp->desktop()->winId(), geometry.x(), geometry.y(), geometry.width(), geometry.height());

	if (mOptions.cursor && !mPixmap.isNull()) {
	QPainter painter(&mPixmap);
	painter.drawPixmap(QCursor::pos(), os::cursor());
	}
	}

	QString Screenshot::newFileName() const
	{
	if (!mOptions.directory.exists()) {
	mOptions.directory.mkpath(mOptions.directory.path());
	}

	QString naming = Screenshot::getName(mOptions.namingOptions, mOptions.prefix, mOptions.directory);
	QString path = QDir::toNativeSeparators(mOptions.directory.path());

	// Cleanup
	if (path.at(path.size()-1) != QDir::separator() && !path.isEmpty()) {
	path.append(QDir::separator());
	}

	QString fileName;
	fileName.append(path);
	fileName.append(naming);

	return fileName;
	}

	void Screenshot::selectedArea()
	{
	grabDesktop();

	if (mPixmap.isNull())
	return;

	AreaDialog selector(this);
	int result = selector.exec();

	if (result == QDialog::Accepted) {
	mPixmap = mPixmap.copy(selector.resultRect());
	}
	else {
	mPixmap = QPixmap();
	}
	}

	void Screenshot::selectedWindow()
	{
	WindowPicker* windowPicker = new WindowPicker;
	mPixmapDelay = true;

	connect(windowPicker, SIGNAL(pixmap(QPixmap)), this, SLOT(setPixmap(QPixmap)));
	}

	bool Screenshot::unloadPixmap()
	{
	- qDebug() << "Screenshot::Unloading pixmap to temporary file";
	-
	if (mUnloaded)
	return true;

	// Unloading the pixmap to reduce memory usage during previews
	mUnloadFilename = mOptions.directory.path() + QDir::separator() + QString(".lstemp.%1%2").arg(qrand() * qrand() + QDateTime::currentDateTime().toTime_t()).arg(extension());
	mUnloaded = mPixmap.save(mUnloadFilename, 0, mOptions.quality);

	if (mUnloaded) {
	mPixmap = QPixmap();
	}

	return mUnloaded;
	}

	void Screenshot::wholeScreen()
	{
	grabDesktop();
	}


	diff --git a/tools/screenshotmanager.cpp b/tools/screenshotmanager.cpp
	index 101ebc3..3e9d617 100644
	--- a/tools/screenshotmanager.cpp
	+++ b/tools/screenshotmanager.cpp
	@@ -1,148 +1,148 @@
	/*
	* Copyright (C) 2011 Christian Kaiser
	*
	* 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 library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*
	*/
	#include "screenshotmanager.h"
	#include "screenshot.h"
	#include "uploader.h"

	#include <QApplication>
	#include <QDateTime>
	#include <QDebug>
	#include <QDesktopServices>
	#include <QFile>
	#include <QSettings>

	ScreenshotManager::ScreenshotManager(QObject *parent = 0) : QObject(parent)
	{
	if (QFile::exists(qApp->applicationDirPath() + "/config.ini")) {
	mSettings = new QSettings(qApp->applicationDirPath() + QDir::separator() + "config.ini", QSettings::IniFormat);
	mHistoryPath = qApp->applicationDirPath() + QDir::separator() + "history";
	mPortableMode = true;
	}
	else {
	mSettings = new QSettings();
	mHistoryPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + QDir::separator() + "history";
	mPortableMode = false;
	}

	- connect(Uploader::instance(), SIGNAL(done(QString, QString)), this, SLOT(uploadDone(QString, QString)));
	+ connect(Uploader::instance(), SIGNAL(done(QString, QString, QString)), this, SLOT(uploadDone(QString, QString, QString)));
	}

	ScreenshotManager::~ScreenshotManager()
	{
	delete mSettings;
	}

	int ScreenshotManager::activeCount() const
	{
	return mScreenshots.count();
	}

	QString& ScreenshotManager::historyPath()
	{
	return mHistoryPath;
	}

	bool ScreenshotManager::portableMode()
	{
	return mPortableMode;
	}

	-void ScreenshotManager::saveHistory(QString fileName, QString url)
	+void ScreenshotManager::saveHistory(QString fileName, QString url, QString deleteHash)
	{
	if (!mSettings->value("/options/history", true).toBool())
	return;

	QFile historyFile(mHistoryPath);
	QTextStream out(&historyFile);

	if (!historyFile.exists())
	{
	QString path = mHistoryPath;
	path.chop(7);

	if (!QDir().mkpath(path))
	return;
	}

	if (historyFile.open(QFile::WriteOnly \| QFile::Append)) {
	- out << QString("%1\|%2\|%3").arg(fileName).arg(url).arg(QDateTime::currentMSecsSinceEpoch()) << "\n";
	+ out << QString("%1\|%2\|%3\|%4").arg(fileName).arg(url).arg(deleteHash).arg(QDateTime::currentMSecsSinceEpoch()) << "\n";
	historyFile.close();
	}
	}

	//

	void ScreenshotManager::askConfirmation()
	{
	Screenshot* s = qobject_cast<Screenshot*>(sender());
	emit confirm(s);
	}

	void ScreenshotManager::cleanup()
	{
	Screenshot* screenshot = qobject_cast<Screenshot*>(sender());
	emit windowCleanup(screenshot->options());
	}

	void ScreenshotManager::finished()
	{
	Screenshot* screenshot = qobject_cast<Screenshot*>(sender());
	mScreenshots.removeOne(screenshot);
	screenshot->deleteLater();
	}

	void ScreenshotManager::take(Screenshot::Options &options)
	{
	Screenshot* newScreenshot = new Screenshot(this, options);
	mScreenshots.append(newScreenshot);

	connect(newScreenshot, SIGNAL(askConfirmation()), this, SLOT(askConfirmation()));
	connect(newScreenshot, SIGNAL(cleanup()) , this, SLOT(cleanup()));
	connect(newScreenshot, SIGNAL(finished()) , this, SLOT(finished()));

	newScreenshot->take();
	}

	-void ScreenshotManager::uploadDone(QString fileName, QString url)
	+void ScreenshotManager::uploadDone(QString fileName, QString url, QString deleteHash)
	{
	foreach (Screenshot* screenshot, mScreenshots) {
	if (screenshot->options().fileName == fileName
	\|\| screenshot->unloadedFileName() == fileName) {
	screenshot->uploadDone(url);

	if (screenshot->options().file) {
	- saveHistory(fileName, url);
	+ saveHistory(fileName, url, deleteHash);
	}
	else {
	- saveHistory(QObject::tr("- no file -"), url);
	+ saveHistory(QObject::tr("- no file -"), url, deleteHash);
	}
	}
	}
	}

	// Singleton
	ScreenshotManager* ScreenshotManager::mInstance = 0;

	ScreenshotManager *ScreenshotManager::instance()
	{
	if (!mInstance)
	mInstance = new ScreenshotManager();

	return mInstance;
	}
	diff --git a/tools/screenshotmanager.h b/tools/screenshotmanager.h
	index 578ad7d..c3d0210 100644
	--- a/tools/screenshotmanager.h
	+++ b/tools/screenshotmanager.h
	@@ -1,71 +1,71 @@
	/*
	* Copyright (C) 2011 Christian Kaiser
	*
	* 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 library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*
	*/
	#ifndef SCREENSHOTMANAGER_H
	#define SCREENSHOTMANAGER_H

	#include <QObject>
	#include <QList>

	#include "screenshot.h"
	#include "qxtcsvmodel.h"

	class QSettings;
	class ScreenshotManager : public QObject
	{
	Q_OBJECT

	public:
	enum State
	{
	Idle = 0,
	Busy = 1,
	Disabled = 2
	};

	public:
	ScreenshotManager(QObject *parent);
	~ScreenshotManager();
	static ScreenshotManager *instance();

	int activeCount() const;
	QString &historyPath();
	bool portableMode();
	- void saveHistory(QString fileName, QString url = QObject::tr("- not uploaded -"));// TODO: No TR?
	+ void saveHistory(QString fileName, QString url = QObject::tr("- not uploaded -"), QString deleteHash = "");
	QSettings *settings() const { return mSettings; }

	public slots:
	void askConfirmation();
	void cleanup();
	void finished();
	void take(Screenshot::Options &options);
	- void uploadDone(QString fileName, QString url);
	+ void uploadDone(QString fileName, QString url, QString deleteHash);

	signals:
	void confirm(Screenshot* screenshot);
	void windowCleanup(Screenshot::Options &options);

	private:
	static ScreenshotManager* mInstance;
	QList<Screenshot*> mScreenshots;
	QSettings *mSettings;
	QString mHistoryPath;
	bool mPortableMode;
	};

	#endif // SCREENSHOTMANAGER_H
	diff --git a/tools/uploader.cpp b/tools/uploader.cpp
	index 9a2d591..6db45b3 100644
	--- a/tools/uploader.cpp
	+++ b/tools/uploader.cpp
	@@ -1,163 +1,163 @@
	/*
	* Copyright (C) 2011 Christian Kaiser
	*
	* 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 library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*
	*/
	#include "uploader.h"
	#include "qtimgur.h"
	#include "screenshotmanager.h"

	#include <QList>
	#include <QPair>

	#include <QDebug>

	Uploader* Uploader::mInstance = 0;

	Uploader::Uploader(QObject *parent) : QObject(parent), mProgressSent(0), mProgressTotal(0), mUploading(0)
	{
	mImgur = new QtImgur("6920a141451d125b3e1357ce0e432409", this);

	- connect(mImgur, SIGNAL(uploaded(QString, QString)) , this, SLOT(uploaded(QString, QString)));
	- connect(mImgur, SIGNAL(error(QString, QtImgur::Error)), this, SLOT(imgurError(QString, QtImgur::Error)));
	- connect(mImgur, SIGNAL(uploadProgress(qint64,qint64)) , this, SLOT(reportProgress(qint64, qint64)));
	+ connect(mImgur, SIGNAL(uploaded(QString, QString, QString)), this, SLOT(uploaded(QString, QString, QString)));
	+ connect(mImgur, SIGNAL(error(QString, QtImgur::Error)) , this, SLOT(imgurError(QString, QtImgur::Error)));
	+ connect(mImgur, SIGNAL(uploadProgress(qint64,qint64)) , this, SLOT(reportProgress(qint64, qint64)));
	}

	Uploader *Uploader::instance()
	{
	if (!mInstance)
	mInstance = new Uploader();

	return mInstance;
	}

	QString Uploader::lastUrl() const
	{
	QListIterator< QPair<QString, QString> > i(mScreenshots);
	i.toBack();

	QString url;

	while (i.hasPrevious()) {
	url = i.previous().second;

	if (!url.contains(tr("Uploading..."))) {
	return url;
	}
	}

	return url;
	}

	void Uploader::cancel()
	{
	mImgur->cancelAll();
	}

	void Uploader::imgurError(const QString &file, const QtImgur::Error e)
	{
	mUploading--;

	// Removing the screenshot.
	for (int i = 0; i < mScreenshots.size(); ++i) {
	if (mScreenshots.at(i).first == file) {
	mScreenshots.removeAt(i);
	break;
	}
	}

	if (e == mLastError) {
	// Fail silently? Really? FINE
	return;
	}

	QString errorString;

	switch (e) {
	case QtImgur::ErrorFile:
	errorString = tr("Screenshot file not found.");
	break;
	case QtImgur::ErrorNetwork:
	errorString = tr("Could not reach imgur.com");
	break;
	case QtImgur::ErrorCredits:
	errorString = tr("You have exceeded your upload quota.");
	break;
	case QtImgur::ErrorUpload:
	errorString = tr("Upload failed.");
	break;
	}

	mLastError = e;

	emit error(errorString);
	}

	void Uploader::upload(const QString &fileName)
	{
	if (fileName.isEmpty()) {
	qDebug() << "Trying to upload an empty filename.";
	return;
	}

	// Cancel on duplicate
	for (int i = 0; i < mScreenshots.size(); ++i) {
	if (mScreenshots.at(i).first == fileName) {
	return;
	}
	}

	qDebug() << "Uploader::upload(" << fileName << ")";
	mImgur->upload(fileName);

	QPair<QString, QString> screenshot;
	screenshot.first = fileName;
	screenshot.second = tr("Uploading...");

	mScreenshots.append(screenshot);

	mUploading++;
	}

	-void Uploader::uploaded(const QString &file, const QString &url)
	+void Uploader::uploaded(const QString &file, const QString &url, const QString &deleteHash)
	{
	// Modifying uploaded list, adding url.
	for (int i = 0; i < mScreenshots.size(); ++i) {
	if (mScreenshots.at(i).first == file) {
	mScreenshots[i].second = url;
	break;
	}
	}

	mUploading--;

	- emit done(file, url);
	+ emit done(file, url, deleteHash);
	}

	int Uploader::uploading()
	{
	return mUploading;
	}

	void Uploader::reportProgress(qint64 sent, qint64 total)
	{
	mProgressSent = sent;
	mProgressTotal = total;

	qDebug() << "Reporting progress: " << mProgressSent << " of " << mProgressTotal;

	emit progress(sent, total);
	}
	diff --git a/tools/uploader.h b/tools/uploader.h
	index 7ddb0ee..f3e91a0 100644
	--- a/tools/uploader.h
	+++ b/tools/uploader.h
	@@ -1,66 +1,66 @@
	/*
	* Copyright (C) 2011 Christian Kaiser
	*
	* 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 library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*
	*/
	#ifndef UPLOADER_H
	#define UPLOADER_H

	#include <QObject>
	#include <QList>
	#include <QPair>
	#include "qtimgur.h"

	class Uploader : public QObject
	{
	Q_OBJECT

	public:
	Uploader(QObject *parent = 0);
	static Uploader* instance();
	QString lastUrl() const;
	QList< QPair<QString, QString> > &screenshots() { return mScreenshots; }
	qint64 progressSent() const { return mProgressSent; }
	qint64 progressTotal() const { return mProgressTotal; }

	public slots:
	void cancel();
	void imgurError(const QString &file, const QtImgur::Error e);
	void upload(const QString &fileName);
	- void uploaded(const QString &fileName, const QString &url);
	+ void uploaded(const QString &fileName, const QString &url, const QString &deleteHash);
	int uploading();
	void reportProgress(qint64 sent, qint64 total);

	signals:
	- void done(QString, QString);
	+ void done(QString, QString, QString);
	void error(QString);
	void progress(qint64, qint64);

	private:
	static Uploader* mInstance;

	// Filename, url
	QList< QPair<QString, QString> > mScreenshots;
	QtImgur *mImgur;
	QtImgur::Error mLastError;

	qint64 mProgressSent;
	qint64 mProgressTotal;

	int mUploading;
	};

	#endif // UPLOADER_H

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jun 16, 12:57 AM (2 w, 1 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 69950
Default Alt Text: (136 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions