Skip to content

Commit

Permalink
added makefile, restructured project
Browse files Browse the repository at this point in the history
  • Loading branch information
cinatic committed May 2, 2018
1 parent 77c7a14 commit 800b6b5
Show file tree
Hide file tree
Showing 15 changed files with 110 additions and 187 deletions.
78 changes: 78 additions & 0 deletions Makefile
@@ -0,0 +1,78 @@
#!/usr/bin/make -f

# Copyright (C) 2018 Florijan Hamzic <fh[at]infinicode.de>
# This file is distributed under the same license as the stocks-extension package.

.PHONY: clean mrproper

EXTENSION_NAME := stocks
UUID := $(EXTENSION_NAME)@infinicode.de
AUTHOR_MAIL := fh@infinicode.de
VERSION := 3

BUILD_DIR := _build

SRC_DIR := $(UUID)
SCHEMAS_DIR := $(SRC_DIR)/schemas
PO_DIR := $(SRC_DIR)/po
LOCALE_DIR := $(SRC_DIR)/locale

JS_FILES := $(wildcard $(SRC_DIR)/*.js)
UI_FILES := $(wildcard $(SRC_DIR)/*.ui)

FILES := $(SRC_DIR)/* README.md
COMPILED_SCHEMAS := $(SCHEMAS_DIR)/gschemas.compiled

PO_FILES := $(wildcard $(PO_DIR)/*.po)
MO_FILES := $(PO_FILES:$(PO_DIR)/%.po=$(LOCALE_DIR)/%/LC_MESSAGES/$(UUID).mo)
MO_DIR := $(PO_FILES:$(PO_DIR)/%.po=$(LOCALE_DIR)/%/LC_MESSAGES)

POT_FILE := $(PO_DIR)/$(UUID).pot
TOLOCALIZE := $(JS_FILES:$(SRC_DIR)/%.js=%.js) $(UI_FILES:$(SRC_DIR)/%.ui=%.ui)

ifeq ($(strip $(DESTDIR)),)
INSTALLBASE := $(HOME)/.local
else
INSTALLBASE := $(DESTDIR)/usr
endif

INSTALLBASE := $(INSTALLBASE)/share/gnome-shell/extensions
INSTALL_DIR := $(INSTALLBASE)/$(UUID)

default: build

$(BUILD_DIR):
mkdir -p $@

$(COMPILED_SCHEMAS):
glib-compile-schemas $(SCHEMAS_DIR)

$(LOCALE_DIR)/%/LC_MESSAGES:
mkdir -p $@

$(PO_DIR):
mkdir -p $@

$(PO_DIR)/%.po: $(POT_FILE) $(PO_DIR)
msgmerge -m -U --backup=none $@ $<

$(LOCALE_DIR)/%/LC_MESSAGES/$(UUID).mo: $(PO_DIR)/%.po $(MO_DIR)
msgfmt -c $< -o $@

$(POT_FILE): $(PO_DIR)
cd $(SRC_DIR) && xgettext --from-code=UTF-8 --package-name "gnome-shell-extension-$(EXTENSION_NAME)" --package-version=$(VERSION) --msgid-bugs-address=$(AUTHOR_MAIL) -k_ -kN_ -o po/$(UUID).pot $(TOLOCALIZE) && cd -

build: $(BUILD_DIR) $(COMPILED_SCHEMAS) $(MO_FILES)
cp -r $(FILES) $<

install: build
rm -rf $(INSTALL_DIR)
mkdir -p $(INSTALL_DIR)
cp -r $(BUILD_DIR)/* $(INSTALL_DIR)

clean:
rm -f $(COMPILED_SCHEMAS) $(POT_FILE)
rm -rf $(LOCALE_DIR)

mrproper: clean
rm -rf $(BUILD_DIR)
168 changes: 0 additions & 168 deletions po/messages.pot

This file was deleted.

Binary file removed schemas/gschemas.compiled
Binary file not shown.
File renamed without changes.
17 changes: 15 additions & 2 deletions extension.js → stocks@infinicode.de/extension.js
Expand Up @@ -42,7 +42,7 @@ const Pango = imports.gi.Pango;
const St = imports.gi.St;
const Util = imports.misc.util;

const Gettext = imports.gettext.domain('gnome-shell-extension-stocks');
const Gettext = imports.gettext.domain('stocks@infinicode.de');
const _ = Gettext.gettext;
const ngettext = Gettext.ngettext;

Expand Down Expand Up @@ -716,6 +716,7 @@ const StocksMenuButton = new Lang.Class({
this.quoteBox = new ScrollBox(this, "");
this._renderPanelMenuHeaderBox();

this.actor.connect('button-press-event', Lang.bind(this, this._showNextStockInPanel));
this.menu.connect('open-state-changed', Lang.bind(this, function (menu, isOpen) {
_isOpen = isOpen;

Expand Down Expand Up @@ -822,6 +823,18 @@ const StocksMenuButton = new Lang.Class({
this.service = new FinanceService();
},

// show next stock in panel
_showNextStockInPanel: function(actor, event) {
// left click === 1, middle click === 2, right click === 3
const buttonID = event.get_button();

if (buttonID=== 2 || buttonID === 3) {
this.menu.close();
this.refreshGlobalPanelLabels();
this.setToggleDisplayTimeout();
}
},

setRefreshTaskDataTimeout: function () {
if (this._refreshTaskDataTimeoutID) {
Mainloop.source_remove(this._refreshTaskDataTimeoutID);
Expand Down Expand Up @@ -934,7 +947,7 @@ const StocksMenuButton = new Lang.Class({
let stocksMenu;

function init(extensionMeta) {
Convenience.initTranslations('gnome-shell-extension-stocks');
Convenience.initTranslations('stocks@infinicode.de');
let theme = imports.gi.Gtk.IconTheme.get_default();
theme.append_search_path(extensionMeta.path + "/icons");
}
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
26 changes: 13 additions & 13 deletions po/de.po → stocks@infinicode.de/po/de.po
Expand Up @@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-24 11:25+0200\n"
"Report-Msgid-Bugs-To: fh@infinicode.de\n"
"POT-Creation-Date: 2018-05-02 14:33+0200\n"
"PO-Revision-Date: 2018-04-23 13:18+0200\n"
"Last-Translator: <fh@infinicode.de>\n"
"Language-Team: German\n"
Expand Down Expand Up @@ -80,19 +80,24 @@ msgstr ""
msgid "…"
msgstr ""

#: settings.ui:47 prefs.js:292
#: prefs.js:292 settings.ui:47
msgid "Name"
msgstr ""

#: settings.ui:65 settings.ui:95 settings.ui:204 settings.ui:234
msgid "Clear entry"
msgstr "Feld leeren"

#: settings.ui:79 prefs.js:303
#: prefs.js:303 settings.ui:79
#, fuzzy
msgid "Google Symbol"
msgstr "Google Symbol editieren"

#: prefs.js:463
#, javascript-format
msgid "Remove %s ?"
msgstr "%s entfernen?"

#: settings.ui:65 settings.ui:95 settings.ui:204 settings.ui:234
msgid "Clear entry"
msgstr "Feld leeren"

#: settings.ui:125 settings.ui:264
msgid "Cancel"
msgstr "Abbrechen"
Expand Down Expand Up @@ -166,8 +171,3 @@ msgstr ""
#: settings.ui:681
msgid "About"
msgstr ""

#: prefs.js:463
#, javascript-format
msgid "Remove %s ?"
msgstr "%s entfernen?"
4 changes: 2 additions & 2 deletions prefs.js → stocks@infinicode.de/prefs.js
@@ -1,6 +1,6 @@
const Gtk = imports.gi.Gtk;
const GObject = imports.gi.GObject;
const Gettext = imports.gettext.domain('gnome-shell-extension-stocks');
const Gettext = imports.gettext.domain('stocks@infinicode.de');
const _ = Gettext.gettext;
const Soup = imports.gi.Soup;

Expand Down Expand Up @@ -508,7 +508,7 @@ const PrefsWidget = new GObject.Class({
});

function init() {
Convenience.initTranslations('gnome-shell-extension-stocks');
Convenience.initTranslations('stocks@infinicode.de');
}

function buildPrefsWidget() {
Expand Down
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist gettext-domain="gnome-shell-extension-stocks">
<schemalist gettext-domain="stocks@infinicode.de">
<enum id="org.gnome.shell.extensions.stocks.position">
<value value="0" nick="center"/>
<value value="1" nick="right"/>
Expand Down
2 changes: 1 addition & 1 deletion settings.ui → stocks@infinicode.de/settings.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface domain="gnome-shell-extension-stocks">
<interface domain="stocks@infinicode.de">
<requires lib="gtk+" version="3.8"/>
<object class="GtkAdjustment" id="current-refresh-adjustment">
<property name="lower">10</property>
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 800b6b5

Please sign in to comment.