fixes #8, #9, #10

misc0110 · misc0110 · commit b3dd346c93ef · 2020-03-26T22:42:15.000+01:00
diff --git a/data/livetikz.desktop b/data/livetikz.desktop
@@ -7,5 +7,5 @@ MimeType=text/x-pgf;text/x-tex;
 Exec=livetikz %f
 Icon=livetikz.png
 Terminal=false
-Categories=Office;Editor;
+Categories=Office;Development;Science;
 Keywords=TikZ;LaTeX;editor;
diff --git a/dist/livetikz_0.3_amd64.deb b/dist/livetikz_0.3_amd64.deb
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -263,7 +263,11 @@ MainWindow::MainWindow() : currentDoc(NULL), renderProcess(NULL), currentPage(0)
   dir = NULL;
   templateFile = QUrl(settings.value("template", "").toString());
   updateTemplate(templateFile.path());
-  templateLabel->setText(templateFile.url(QUrl::PreferLocalFile));
+  if(templateFile.url(QUrl::PreferLocalFile) == "") {
+    templateLabel->setText("<internal template>");
+  } else {
+    templateLabel->setText(templateFile.url(QUrl::PreferLocalFile));
+  }
   
   texfileWatcher = NULL;
 
@@ -493,7 +497,7 @@ void MainWindow::updateTemplate(const QString& filename) {
 }
 
 void MainWindow::browse() {
-  QUrl newTemplateFile = QFileDialog::getOpenFileUrl(this, QString("Open template"));
+  QUrl newTemplateFile = QFileDialog::getOpenFileUrl(this, QString("Open template"), QUrl::fromLocalFile("/usr/share/livetikz/"));
   if (newTemplateFile.fileName() != "") {
       QString filename = newTemplateFile.url(QUrl::PreferLocalFile);
       templateLabel->setText(filename);
diff --git a/makedeb.sh b/makedeb.sh
@@ -3,6 +3,9 @@ if test `whoami` != "root"; then echo "You need to run this target using fakeroo
 mkdir -pv livetikz/usr/bin
 mkdir -pv livetikz/usr/share/doc/livetikz/
 mkdir -pv livetikz/usr/share/man/man1/
+mkdir -pv livetikz/usr/share/applications/
+mkdir -pv livetikz/usr/share/icons/hicolor/256x256/apps
+mkdir -pv livetikz/usr/share/livetikz
 cp build/livetikz livetikz/usr/bin
 strip livetikz/usr/bin/livetikz
 mkdir -p livetikz/DEBIAN
@@ -11,11 +14,16 @@ echo "initial version" > livetikz/usr/share/doc/livetikz/changelog
 echo "Copyright 2020, Michael Schwarz" > livetikz/usr/share/doc/livetikz/copyright
 gzip -c -9 -n livetikz/usr/share/doc/livetikz/changelog > livetikz/usr/share/doc/livetikz/changelog.gz
 gzip -c -9 -n docs/livetikz.1 > livetikz/usr/share/man/man1/livetikz.1.gz
+cp data/livetikz.desktop livetikz/usr/share/applications/
+cp data/livetikz.png livetikz/usr/share/icons/hicolor/256x256/apps
 rm livetikz/usr/share/doc/livetikz/changelog
+cp data/templates/* livetikz/usr/share/livetikz/
 chmod -R 0755 livetikz/usr
-chmod 0644 livetikz/usr/share/doc/livetikz/copyright
-chmod 0644 livetikz/usr/share/doc/livetikz/changelog.gz
+chmod 0644 livetikz/usr/share/doc/livetikz/*
 chmod 0644 livetikz/usr/share/man/man1/livetikz.1.gz
+chmod 0644 livetikz/usr/share/icons/hicolor/256x256/apps/*
+chmod 0644 livetikz/usr/share/applications/*
+chmod 0644 livetikz/usr/share/livetikz/*
 chown -R root:root livetikz/
 dpkg-deb --build livetikz
 rm -rf livetikz
