Merge branch 'master' of https://github.com/gnunn1/terminix

gnunn1 · Jul 13, 2016 · bb87b09 · bb87b09
2 parents b38ca2b + d4ab9f3
commit bb87b09
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 121 deletions.
diff --git a/configure.ac b/configure.ac
@@ -18,14 +18,25 @@ AC_SUBST([DCFLAGS])
 
 # Checks for programs.
 AC_PROG_INSTALL
-AC_PATH_PROG([DC], [dmd])
+# Look for D compiler. Use dmd-compatible wrapper for ldc and gdc.
+# NOTE: Terminix cannot be compiled with gdc currently.
+AC_PATH_PROG([DC], [ldmd dmd gdmd])
 AC_PATH_PROG([GLIB_COMPILE_RES], [glib-compile-resources])
 PKG_PROG_PKG_CONFIG
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.19.7])
 
+GTKD_SUFFIX=
+case $(basename $DC) in
+	dmd) GTKD_SUFFIX=-dmd ;;
+	ldmd) GTKD_SUFFIX=-ldc ;;
+	gdmd) GTKD_SUFFIX=-gdc ;;
+esac
+
 # Checks for libraries.
-PKG_CHECK_MODULES([DEPS], [gtkd-3-dmd >= 3.3.0 vted-3-dmd >= 3.3.0],,
+
+# Use pkg-config to look for gtkd. Tries to find a compiler specific suffix, then falls back to suffix-less
+PKG_CHECK_MODULES([DEPS], [gtkd-3$GTKD_SUFFIX >= 3.3.0 vted-3$GTKD_SUFFIX >= 3.3.0],,
 				  [PKG_CHECK_MODULES([DEPS], [gtkd-3 >= 3.3.0 vted-3 >= 3.3.0])])
 # TODO: test if library was compiled with @DC@?
 

diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
@@ -1,6 +1,6 @@
-appdatadir = $(datadir)/appdata/
+appdatadir = $(datadir)/metainfo/
 appdata_DATA = com.gexperts.Terminix.appdata.xml
-$(appdata_DATA): $(srcdir)/$(appdata_DATA).in
+$(appdata_DATA): $(srcdir)/$(appdata_DATA).in $(top_srcdir)/po/*.po
 	$(MSGFMT) --xml -d $(top_srcdir)/po --template=$< -o $@
 
 EXTRA_DIST = $(appdata_DATA).in

diff --git a/data/appdata/com.gexperts.Terminix.appdata.xml.in b/data/appdata/com.gexperts.Terminix.appdata.xml.in
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2016 Matthias Clasen -->
 <component type="desktop">
-  <id type="desktop">com.gexperts.Terminix.desktop</id>
+  <id>com.gexperts.Terminix.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>MPL-2.0</project_license>
+
   <name>Terminix</name>
   <summary>A tiling terminal for GNOME</summary>
+
   <description>
     <p>
-    Terminix is a tiling terminal emulator.
+      Terminix is a tiling terminal emulator.
     </p>
     <p>It lets you:</p>
     <ul>
@@ -23,15 +25,23 @@
     <li>Supports notifications when processes are completed out of view</li>
     </ul>
     <p>
-     The application was written using GTK 3 and an effort was made to conform to
-     GNOME Human Interface Guidelines (HIG). As a result, it does use client-side-decorations, though it can be disabled if necessary.
+      The application was written using GTK 3 and an effort was made to conform to
+      GNOME Human Interface Guidelines (HIG). As a result, it does use client-side-decorations, though it can be disabled if necessary.
     </p>
     <p>Terminix has been tested with GNOME and with Unity.</p>
   </description>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>http://www.gexperts.com/img/terminix/terminix2.png</image>
+    </screenshot>
+  </screenshots>
+
   <kudos>
     <kudo>AppMenu</kudo>
     <kudo>ModernToolkit</kudo>
   </kudos>
+
   <url type="homepage">https://github.com/gnunn1/terminix/</url>
   <project_group>GNOME</project_group>
   <translation type="gettext">terminix</translation>

diff --git a/data/pkg/desktop/Makefile.am b/data/pkg/desktop/Makefile.am
@@ -1,6 +1,6 @@
 desktopdir = $(datadir)/applications/
 desktop_DATA = com.gexperts.Terminix.desktop
-$(desktop_DATA): $(srcdir)/$(desktop_DATA).in
+$(desktop_DATA): $(srcdir)/$(desktop_DATA).in $(top_srcdir)/po/*.po
 	$(MSGFMT) --desktop -d $(top_srcdir)/po --template=$< -o $@
 
 EXTRA_DIST = $(desktop_DATA).in

diff --git a/dub.json b/dub.json
@@ -1,19 +1,23 @@
 {
-	"name": "terminix",
-	"description": "A VTE based terminal emulator for Linux",
-	"copyright": "Copyright © 2016, Gerald Nunn",
-	"authors": ["Gerald Nunn"],
+    "name": "terminix",
+    "description": "A VTE based terminal emulator for Linux",
+    "copyright": "Copyright © 2016, Gerald Nunn",
+    "authors": ["Gerald Nunn"],
+
     "dependencies": {
-		"gtk-d": "~>3.3.0"
-	},
-	"buildTypes": {
-		"release": {
+        "gtk-d": "~>3.3.0"
+    },
+
+    "buildTypes": {
+        "release": {
             "versions": ["StdLoggerDisableTrace"]
-		},
+        },
+
         "localize": {
             "versions": ["Localize"]
         }
-	},
+    },
+
     "configurations": [
         {
             "name": "default",

diff --git a/install.sh b/install.sh
@@ -88,9 +88,9 @@ cp -r data/icons/hicolor/. ${PREFIX}/share/icons/hicolor
 mkdir -p ${PREFIX}/bin
 cp terminix ${PREFIX}/bin/terminix
 mkdir -p ${PREFIX}/share/applications
-mkdir -p ${PREFIX}/share/appdata
+mkdir -p ${PREFIX}/share/metainfo
 cp data/pkg/desktop/com.gexperts.Terminix.desktop ${PREFIX}/share/applications
-cp data/appdata/com.gexperts.Terminix.appdata.xml ${PREFIX}/share/appdata
+cp data/appdata/com.gexperts.Terminix.appdata.xml ${PREFIX}/share/metainfo
 
 desktop-file-validate ${PREFIX}/share/applications/com.gexperts.Terminix.desktop
 

diff --git a/po/de.po b/po/de.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: German (Terminix)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-04 11:07+0200\n"
-"PO-Revision-Date: 2016-07-04 09:30+0000\n"
+"PO-Revision-Date: 2016-07-13 07:56+0000\n"
 "Last-Translator: Philipp Wolfer <[email protected]>\n"
 "Language-Team: German "
 "<https://hosted.weblate.org/projects/terminix/translations/de/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: source/gx/terminix/colorschemes.d:167
 #, c-format
@@ -640,7 +640,7 @@ msgstr "Zeichenkodierung"
 #: source/gx/terminix/profilewindow.d:735,
 #: source/gx/terminix/profilewindow.d:740,
 msgid "Ambiguous-width characters"
-msgstr "Zeichen mit unbekannter Breite:"
+msgstr "Zeichen mit unbekannter Breite"
 
 #: source/gx/terminix/profilewindow.d:738
 #: source/gx/terminix/profilewindow.d:743
@@ -1308,7 +1308,7 @@ msgstr "Aktiviere Transparenz, erforder Neustart"
 #: source/gx/terminix/prefwindow.d:564,
 #: source/gx/terminix/prefwindow.d:573,
 msgid "Terminal title style"
-msgstr "Stil der Terminal-Titelzeile"
+msgstr "Stil der Terminal-Titelzeile:"
 
 #: source/gx/terminix/prefwindow.d:519 source/gx/terminix/prefwindow.d:565
 #: source/gx/terminix/prefwindow.d:574 source/gx/terminix/prefwindow.d:580
@@ -2391,25 +2391,21 @@ msgid "Application"
 msgstr "Anwendung"
 
 #: data/resources/ui/shortcuts.ui:19
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Open a new window"
 msgstr "Neues Fenster öffnen"
 
 #: data/resources/ui/shortcuts.ui:25
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Open a new session"
 msgstr "Neue Sitzung erstellen"
 
 #: data/resources/ui/shortcuts.ui:31
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Open preferences"
 msgstr "Einstellungsdialog öffnen"
 
 #: data/resources/ui/shortcuts.ui:37
-#, fuzzy
 msgctxt "shortcut window"
 msgid "View configured shortcuts"
 msgstr "Konfigurierte Tastenkombinationen anzeigen"
@@ -2420,7 +2416,6 @@ msgid "Window"
 msgstr "Fenster"
 
 #: data/resources/ui/shortcuts.ui:49
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Toggle fullscreen mode"
 msgstr "Vollbildmodus ein-/ausschalten"
@@ -2431,73 +2426,61 @@ msgid "View session sidebar"
 msgstr "Sitzungs-Seitenleiste anzeigen"
 
 #: data/resources/ui/shortcuts.ui:61
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to next session"
 msgstr "Zur nächsten Sitzung wechseln"
 
 #: data/resources/ui/shortcuts.ui:67
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to previous session"
 msgstr "Zur vorherigen Sitzung wechseln"
 
 #: data/resources/ui/shortcuts.ui:73
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to session 1"
 msgstr "Zu Sitzung 1 wechseln"
 
 #: data/resources/ui/shortcuts.ui:79
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to session 2"
 msgstr "Zu Sitzung 2 wechseln"
 
 #: data/resources/ui/shortcuts.ui:85
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to session 3"
 msgstr "Zu Sitzung 3 wechseln"
 
 #: data/resources/ui/shortcuts.ui:91
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to session 4"
 msgstr "Zu Sitzung 4 wechseln"
 
 #: data/resources/ui/shortcuts.ui:97
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to session 5"
 msgstr "Zu Sitzung 5 wechseln"
 
 #: data/resources/ui/shortcuts.ui:103
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to session 6"
 msgstr "Zu Sitzung 6 wechseln"
 
 #: data/resources/ui/shortcuts.ui:109
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to session 7"
 msgstr "Zu Sitzung 7 wechseln"
 
 #: data/resources/ui/shortcuts.ui:115
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to session 8"
 msgstr "Zu Sitzung 8 wechseln"
 
 #: data/resources/ui/shortcuts.ui:121
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to session 9"
 msgstr "Zu Sitzung 9 wechseln"
 
 #: data/resources/ui/shortcuts.ui:127
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Switch to session 10"
 msgstr "Zu Sitzung 10 wechseln"
@@ -2508,45 +2491,38 @@ msgid "Session"
 msgstr "Sitzung"
 
 #: data/resources/ui/shortcuts.ui:143
-#, fuzzy
 msgctxt "shortcut window"
 msgid "File"
 msgstr "Datei"
 
 #: data/resources/ui/shortcuts.ui:147
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Close the current session"
 msgstr "Aktuelle Sitzung schließen"
 
 #: data/resources/ui/shortcuts.ui:153
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Save the current session"
 msgstr "Aktuelle Sitzung speichern"
 
 #: data/resources/ui/shortcuts.ui:159
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Save the current session with new filename"
 msgstr "Aktuelle Sitzung unter neuem Dateinamen speichern"
 
 #: data/resources/ui/shortcuts.ui:165
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Open a saved session"
 msgstr "Gespeicherte Sitzung öffnen"
 
 #: data/resources/ui/shortcuts.ui:173 data/resources/ui/shortcuts.ui:191
 #: data/resources/ui/shortcuts.ui:173,
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Resize"
 msgstr "Größe ändern"
 
 #: data/resources/ui/shortcuts.ui:177 data/resources/ui/shortcuts.ui:195
 #: data/resources/ui/shortcuts.ui:177,
-#, fuzzy
 msgctxt "shortcut window"
 msgid "Resize the terminal up"
 msgstr "Terminalgröße aufwärts verändern"
@@ -3094,7 +3070,6 @@ msgid "Automatic Profile Switching"
 msgstr "Automatischer Profilwechsel"
 
 #: source/gx/terminix/profilewindow.d:860
-#, fuzzy
 msgid "Match"
 msgstr "Übereinstimmung"
 
@@ -3104,28 +3079,24 @@ msgid "Add"
 msgstr "Hinzufügen"
 
 #: source/gx/terminix/profilewindow.d:874
-#, fuzzy
 msgid "Add New Match"
 msgstr "Neue Übereinstimmung hinzufügen"
 
 #: source/gx/terminix/profilewindow.d:874
-#, fuzzy
 msgid "Enter hostname:directory to match"
-msgstr "Rechnername:Verzeichnis eingeben"
+msgstr "Rechnername:Ordner eingeben"
 
 #: source/gx/terminix/profilewindow.d:889
-#, fuzzy
 msgid "Edit Match"
 msgstr "Übereinstimmung bearbeiten"
 
 #: source/gx/terminix/profilewindow.d:889
-#, fuzzy
 msgid "Edit hostname:directory to match"
-msgstr "Rechnername:Verzeichnis bearbeiten"
+msgstr "Rechnername:Ordner bearbeiten"
 
 #: source/gx/terminix/prefwindow.d:593
 msgid "Background image"
-msgstr "Hintergrundbild"
+msgstr "Hintergrundbild:"
 
 #: source/gx/terminix/prefwindow.d:595
 msgid "Select Image"