aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src-qt5/desktop-utils/lumina-calculator/lumina-calculator.desktop2
-rw-r--r--src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer-pandora.desktop2
-rw-r--r--src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.desktop2
-rw-r--r--src-qt5/desktop-utils/lumina-pdf/Renderer-poppler.cpp7
-rw-r--r--src-qt5/desktop-utils/lumina-pdf/lumina-pdf.desktop2
-rw-r--r--src-qt5/desktop-utils/lumina-pdf/mainUI.cpp4
-rw-r--r--src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.desktop2
-rw-r--r--src-qt5/desktop-utils/lumina-textedit/lumina-textedit.desktop2
8 files changed, 12 insertions, 11 deletions
diff --git a/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.desktop b/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.desktop
index 8732425a..1b664bea 100644
--- a/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.desktop
+++ b/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.desktop
@@ -4,7 +4,7 @@ Icon=accessories-calculator
Terminal=false
Type=Application
StartupNotify=true
-Categories=Utility;
+Categories=Office;Utility;
Name=Calculator
GenericName=Scientific Calculator for Lumina
Comment=Perform mathematical calculations
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer-pandora.desktop b/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer-pandora.desktop
index b09fb735..fed6226e 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer-pandora.desktop
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer-pandora.desktop
@@ -5,7 +5,7 @@ Icon=pandora
Terminal=false
Type=Application
StartupNotify=true
-Categories=Utility;
+Categories=AudioVideo;
MimeType=
Name=Pandora Internet Radio
Comment=Listen to Free Music You'll Love
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.desktop b/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.desktop
index 1d6707f4..bb391e53 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.desktop
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.desktop
@@ -4,7 +4,7 @@ Icon=applications-multimedia
Terminal=false
Type=Application
StartupNotify=true
-Categories=Utility;
+Categories=AudioVideo;
MimeType=
Name=Lumina Media Player
Comment=Play Multimedia Content
diff --git a/src-qt5/desktop-utils/lumina-pdf/Renderer-poppler.cpp b/src-qt5/desktop-utils/lumina-pdf/Renderer-poppler.cpp
index b8828557..2b28d0c3 100644
--- a/src-qt5/desktop-utils/lumina-pdf/Renderer-poppler.cpp
+++ b/src-qt5/desktop-utils/lumina-pdf/Renderer-poppler.cpp
@@ -6,7 +6,7 @@ class Link {
public:
Link(TextData *_data, Poppler::Link *_link) : data(_data), link(_link) { }
~Link() { delete data; }
-
+
TextData* getData() { return data; }
Poppler::Link* getLink() { return link; }
@@ -91,6 +91,7 @@ bool Renderer::loadDocument(QString path, QString password){
void Renderer::renderPage(int pagenum, QSize DPI, int degrees){
//qDebug() << "Render Page:" << pagenum << DPI << degrees;
+
if(DOC!=0){
Poppler::Page *PAGE = DOC->page(pagenum);
QImage img;
@@ -163,7 +164,7 @@ bool Renderer::supportsExtraFeatures() { return false; }
void Renderer::traverseOutline(void *, int) { }
-void Renderer::handleLink(QWidget *obj, QString linkDest) {
+void Renderer::handleLink(QWidget *obj, QString linkDest) {
Poppler::Link* trueLink;
foreach(QList<Link*> linkArray, linkHash) {
for(int i = 0; i < linkArray.size(); i++) {
@@ -186,7 +187,7 @@ void Renderer::handleLink(QWidget *obj, QString linkDest) {
}
}
-TextData* Renderer::linkList(int pageNum, int entry) {
+TextData* Renderer::linkList(int pageNum, int entry) {
if(linkHash[pageNum].size() > 0)
return linkHash[pageNum][entry]->getData();
else
diff --git a/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.desktop b/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.desktop
index c9632c9f..e81b2f73 100644
--- a/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.desktop
+++ b/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.desktop
@@ -4,7 +4,7 @@ Icon=application-pdf
Terminal=false
Type=Application
StartupNotify=true
-Categories=Utility;
+Categories=Office;Graphics
MimeType=application/pdf;
Name=Lumina PDF Viewer
Comment=View PDF Files
diff --git a/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp b/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp
index 01f89c5d..f0b64948 100644
--- a/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp
@@ -227,7 +227,7 @@ void MainUI::loadFile(QString path){
if(!QFile::exists(path) || path.isEmpty() ){ return; }
QString password;
bool ok = true;
-
+
while( ok && !BACKEND->loadDocument(path, password) && BACKEND->needPassword() ){
password = QInputDialog::getText(this, tr("Unlock PDF"), tr("Password:"), QLineEdit::Password, "", &ok);
if(!ok){ break; } //cancelled
@@ -370,7 +370,7 @@ void MainUI::startLoadingPages(int degrees){
// Using Qt to scale the image (adjust page value) smooths out the image quite a bit without a lot of performance loss (but cannot scale up without pixelization)
// The best approach seams to be to increase the DPI a bit, but match that with the same scaling on the page size (smoothing)
- QSize DPI(150,150); //print-quality (some printers even go to 600 DPI nowdays)
+ QSize DPI(250,250); //print-quality (some printers even go to 600 DPI nowdays)
/*qDebug() << "Screen Resolutions:";
QList<QScreen*> screens = QApplication::screens();
diff --git a/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.desktop b/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.desktop
index c4678265..a2abbb9a 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.desktop
+++ b/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.desktop
@@ -4,6 +4,6 @@ Icon=camera-web
Terminal=false
Type=Application
StartupNotify=true
-Categories=Utility;
+Categories=Graphics;
Name=Lumina Screenshot
Comment=Take Screenshot
diff --git a/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.desktop b/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.desktop
index 471f4985..bd585a92 100644
--- a/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.desktop
+++ b/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.desktop
@@ -4,7 +4,7 @@ Icon=document-edit
Terminal=false
Type=Application
StartupNotify=true
-Categories=Utility;
+Categories=Office;Development;
MimeType=text/plain;text/x-log;text/*;
Name=Lumina Text Editor
Comment=Plaintext editor with syntax highlighting
bgstack15