[the-board] [tb] Rename libtb to libthe-board and Tb to TheBoard
- From: Lucas Rocha <lucasr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [the-board] [tb] Rename libtb to libthe-board and Tb to TheBoard
- Date: Tue, 22 Feb 2011 22:27:59 +0000 (UTC)
commit 0bf9ad17285f5f18253e2433b3bcad94826bb49b
Author: Lucas Rocha <lucasr gnome org>
Date: Fri Feb 11 20:40:34 2011 +0000
[tb] Rename libtb to libthe-board and Tb to TheBoard
For clarity reasons. Tb is too generic for an app-specific library and
namespace.
src/Makefile-tb.am | 30 +++++-----
src/Makefile.am | 2 +-
src/js/model/pageManager.js | 24 ++++----
src/js/model/pageModel.js | 14 ++--
src/js/ui/background.js | 12 ++--
src/js/ui/backgrounds/tiled.js | 4 +-
src/js/ui/mainWindow.js | 92 +++++++++++++++---------------
src/js/ui/page.js | 52 +++++++++---------
src/js/ui/pageButton.js | 24 ++++----
src/js/ui/thing.js | 38 ++++++------
src/js/ui/things/photo.js | 22 ++++----
src/js/ui/things/sound.js | 120 ++++++++++++++++++++--------------------
src/js/ui/things/text.js | 33 ++++++-----
src/js/ui/things/video.js | 92 +++++++++++++++---------------
src/js/ui/toolBox.js | 36 ++++++------
src/js/ui/toolBoxPages.js | 68 +++++++++++-----------
src/js/ui/toolbar.js | 36 ++++++------
src/js/util/http.js | 4 +-
18 files changed, 353 insertions(+), 350 deletions(-)
---
diff --git a/src/Makefile-tb.am b/src/Makefile-tb.am
index 55d6213..6a4b94c 100644
--- a/src/Makefile-tb.am
+++ b/src/Makefile-tb.am
@@ -64,21 +64,21 @@ tb-enum-types.c: stamp-tb-enum-types.h tb/tb-enum-types.c.in
cp xgen-betc tb-enum-types.c && \
rm -f xgen-betc
-lib_LTLIBRARIES += libtb-1.0.la
+lib_LTLIBRARIES += libthe-board-1.0.la
-libtb_1_0_la_LIBADD = \
+libthe_board_1_0_la_LIBADD = \
$(THE_BOARD_LIBS)
if HAVE_LIBSOUP
-libtb_1_0_la_LIBADD += $(LIBSOUP_LIBS)
+libthe_board_1_0_la_LIBADD += $(LIBSOUP_LIBS)
endif
-libtb_1_0_la_SOURCES = \
+libthe_board_1_0_la_SOURCES = \
$(tb_source_c) \
$(tb_source_h) \
$(tb_built_sources)
-libtb_1_0_la_CPPFLAGS = $(tb_cflags)
+libthe_board_1_0_la_CPPFLAGS = $(tb_cflags)
CLEANFILES += $(THE_BOARD_STAMP_FILES) $(BUILT_SOURCES)
@@ -86,25 +86,25 @@ EXTRA_DIST += \
tb/tb-enum-types.h.in \
tb/tb-enum-types.c.in
-INTROSPECTION_GIRS += Tb-1.0.gir
+INTROSPECTION_GIRS += TheBoard-1.0.gir
-Tb-1.0.gir: libtb-1.0.la Makefile
-Tb_1_0_gir_NAMESPACE = Tb
-Tb_1_0_gir_VERSION = 1.0
-Tb_1_0_gir_LIBS = libtb-1.0.la
-Tb_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(tb_cflags)
-Tb_1_0_gir_SCANNERFLAGS = --warn-all
-Tb_1_0_gir_INCLUDES = \
+TheBoard-1.0.gir: libthe-board-1.0.la Makefile
+TheBoard_1_0_gir_NAMESPACE = TheBoard
+TheBoard_1_0_gir_VERSION = 1.0
+TheBoard_1_0_gir_LIBS = libthe-board-1.0.la
+TheBoard_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(tb_cflags)
+TheBoard_1_0_gir_SCANNERFLAGS = --warn-all --symbol-prefix=tb --identifier-prefix=Tb
+TheBoard_1_0_gir_INCLUDES = \
Clutter-1.0 \
GdkPixbuf-2.0 \
Gtk-3.0 \
Mx-1.0
if HAVE_LIBSOUP
-Tb_1_0_gir_INCLUDES += Soup-2.4
+TheBoard_1_0_gir_INCLUDES += Soup-2.4
endif
-Tb_1_0_gir_FILES = \
+TheBoard_1_0_gir_FILES = \
$(addprefix $(srcdir)/,$(tb_source_h)) \
$(addprefix $(srcdir)/,$(tb_source_c)) \
$(srcdir)/tb-enum-types.h
diff --git a/src/Makefile.am b/src/Makefile.am
index b1a0b7e..22d9411 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,7 +62,7 @@ libexec_PROGRAMS += the-board-start
the_board_start_SOURCES = main.c
the_board_start_LDADD = \
- libtb-1.0.la \
+ libthe-board-1.0.la \
$(THE_BOARD_LIBS)
the_board_start_CPPFLAGS = \
diff --git a/src/js/model/pageManager.js b/src/js/model/pageManager.js
index d3e2cd0..39c5afa 100644
--- a/src/js/model/pageManager.js
+++ b/src/js/model/pageManager.js
@@ -7,7 +7,7 @@ const Signals = imports.signals;
// gi imports
const GIO = imports.gi.Gio;
const GLib = imports.gi.GLib;
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
// model imports
const PageModel = imports.model.pageModel;
@@ -234,12 +234,12 @@ PageManager.prototype = {
this._pagesIndexSavingCancellable = new GIO.Cancellable();
log('PageManager: file.replace_contents_async()');
- Tb.g_file_replace_contents_async(file,
- contentBytes,
- this._pagesIndexSavingCancellable,
- Lang.bind(this,
- this._onPagesIndexReplaceContentsAsync,
- onComplete));
+ TheBoard.g_file_replace_contents_async(file,
+ contentBytes,
+ this._pagesIndexSavingCancellable,
+ Lang.bind(this,
+ this._onPagesIndexReplaceContentsAsync,
+ onComplete));
},
_savePageModels : function(pageModels, onComplete) {
@@ -292,10 +292,10 @@ PageManager.prototype = {
let file = GIO.file_new_for_path(pageModel.path);
log('PageManager: file.delete_async()');
- Tb.g_file_delete_async(file, null,
- Lang.bind(this,
- this._onPageFileDeleteAsync),
- null);
+ TheBoard.g_file_delete_async(file, null,
+ Lang.bind(this,
+ this._onPageFileDeleteAsync),
+ null);
},
_syncPagesWithIndex : function(pageModels) {
@@ -435,7 +435,7 @@ PageManager.prototype = {
log('PageManager: file.delete_finish()');
try {
- Tb.g_file_delete_finish(file, result);
+ TheBoard.g_file_delete_finish(file, result);
} catch(e) {
// FIXME: report io error in some way
log('PageManager: failed to delete page file');
diff --git a/src/js/model/pageModel.js b/src/js/model/pageModel.js
index 1e29c4c..8815ef3 100644
--- a/src/js/model/pageModel.js
+++ b/src/js/model/pageModel.js
@@ -7,7 +7,7 @@ const Signals = imports.signals;
// gi imports
const GLib = imports.gi.GLib;
const GIO = imports.gi.Gio;
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
// util imports
const JSON = imports.util.json;
@@ -134,12 +134,12 @@ PageModel.prototype = {
this._contentSavingCancellable = new GIO.Cancellable();
log('PageModel: file.replace_contents_async()');
- Tb.g_file_replace_contents_async(file,
- contentBytes,
- this._contentSavingCancellable,
- Lang.bind(this,
- this._onReplaceContentsAsync,
- onResult));
+ TheBoard.g_file_replace_contents_async(file,
+ contentBytes,
+ this._contentSavingCancellable,
+ Lang.bind(this,
+ this._onReplaceContentsAsync,
+ onResult));
},
_onLoadContentsAsync : function(file, result, data) {
diff --git a/src/js/ui/background.js b/src/js/ui/background.js
index f125873..7d59bbb 100644
--- a/src/js/ui/background.js
+++ b/src/js/ui/background.js
@@ -1,5 +1,5 @@
// gi imports
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
function Background(args) {
this._init(args);
@@ -26,10 +26,10 @@ Background.prototype = {
_createMainBox : function() {
this._mainBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- name: "background-main-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ name: "background-main-box" });
},
_setContent : function(content) {
@@ -41,7 +41,7 @@ Background.prototype = {
if (this._content) {
this._mainBox.append(this._content.contentActor,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
}
},
diff --git a/src/js/ui/backgrounds/tiled.js b/src/js/ui/backgrounds/tiled.js
index 8deb130..43e026a 100644
--- a/src/js/ui/backgrounds/tiled.js
+++ b/src/js/ui/backgrounds/tiled.js
@@ -2,7 +2,7 @@
const Lang = imports.lang;
// gi imports
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
const Clutter = imports.gi.Clutter;
// ui imports
@@ -42,6 +42,6 @@ TiledBackground.prototype = {
this._bgTexture.filename = this._bgFilename;
this.mainBox.append(this._bgTexture,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
}
}
diff --git a/src/js/ui/mainWindow.js b/src/js/ui/mainWindow.js
index 75d2a6e..ec324da 100644
--- a/src/js/ui/mainWindow.js
+++ b/src/js/ui/mainWindow.js
@@ -5,7 +5,7 @@ const Mainloop = imports.mainloop;
const Tweener = imports.tweener.tweener;
// gi imports
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
const Clutter = imports.gi.Clutter;
const Gdk = imports.gi.Gdk;
const GIO = imports.gi.Gio;
@@ -144,11 +144,11 @@ MainWindow.prototype = {
_createMainBox : function() {
this._mainBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- reactive: true,
- name: "main-window-main-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ reactive: true,
+ name: "main-window-main-box" });
this._stage.add_actor(this._mainBox);
this._stage.show();
@@ -168,23 +168,23 @@ MainWindow.prototype = {
_createContentBox : function() {
this._contentBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- clipToAllocation: true,
- name: "main-window-content-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ clipToAllocation: true,
+ name: "main-window-content-box" });
this._mainBox.append(this._contentBox,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
},
_createStartupBox : function() {
this._startupBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.CENTER,
- yAlign: Tb.BoxAlignment.CENTER,
- reactive: true,
- name: "main-window-startup-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.CENTER,
+ yAlign: TheBoard.BoxAlignment.CENTER,
+ reactive: true,
+ name: "main-window-startup-box" });
let text = Gettext.gettext("The Board is loading. Just a sec.");
@@ -193,14 +193,14 @@ MainWindow.prototype = {
name: "main-window-startup-label" });
this._startupBox.append(this._startupText,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
this._mainBox.append(this._startupBox,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._mainBox.set_fixed_child_align(this._startupBox,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.FILL);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.FILL);
this._startupBoxTimeoutId =
Mainloop.timeout_add_seconds(1, Lang.bind(this,
@@ -226,25 +226,25 @@ MainWindow.prototype = {
_createSpinner : function() {
this._spinnerBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.CENTER,
- yAlign: Tb.BoxAlignment.CENTER,
- visible: false, // starts hidden
- name: "main-window-spinner-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.CENTER,
+ yAlign: TheBoard.BoxAlignment.CENTER,
+ visible: false, // starts hidden
+ name: "main-window-spinner-box" });
this._spinner = new Mx.Spinner({ width: _SPINNER_SIZE,
height: _SPINNER_SIZE,
name: "main-window-spinner" });
this._spinnerBox.append(this._spinner,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
this._mainBox.append(this._spinnerBox,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._mainBox.set_fixed_child_align(this._spinnerBox,
- Tb.BoxAlignment.END,
- Tb.BoxAlignment.START);
+ TheBoard.BoxAlignment.END,
+ TheBoard.BoxAlignment.START);
},
_createContext : function() {
@@ -280,11 +280,11 @@ MainWindow.prototype = {
pageTurn.set_resolution(64, 64);
this._mainBox.append(pageTurn,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._mainBox.set_fixed_child_align(pageTurn,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.FILL);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.FILL);
let onComplete = function() {
delete this._startupBox;
@@ -314,11 +314,11 @@ MainWindow.prototype = {
toolbar.actor.depth = _LAYER_TOOLBAR;
this._contentBox.append(toolbar.actor,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._contentBox.set_fixed_child_align(toolbar.actor,
- Tb.BoxAlignment.CENTER,
- Tb.BoxAlignment.START);
+ TheBoard.BoxAlignment.CENTER,
+ TheBoard.BoxAlignment.START);
},
_setActiveToolbar : function(activeToolbar) {
@@ -507,7 +507,7 @@ MainWindow.prototype = {
this._setAnimatingPageTurn(true);
this._contentBox.append(newPage.actor,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
let pageTurn = new Mx.DeformPageTurn({ radius: 40.0,
angle: 0.80 });
@@ -522,11 +522,11 @@ MainWindow.prototype = {
pageTurn.set_resolution(64, 64);
this._contentBox.append(pageTurn,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._contentBox.set_fixed_child_align(pageTurn,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.FILL);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.FILL);
pageTurn.raise(newPage.actor);
@@ -571,11 +571,11 @@ MainWindow.prototype = {
pageTurn.set_resolution(64, 64);
this._contentBox.append(pageTurn,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._contentBox.set_fixed_child_align(pageTurn,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.FILL);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.FILL);
pageTurn.raise(oldPage.actor);
@@ -591,7 +591,7 @@ MainWindow.prototype = {
newPage.actor.reparent(this._contentBox);
this._contentBox.set_child_packing(newPage.actor,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
pageTurn.destroy();
@@ -677,7 +677,7 @@ MainWindow.prototype = {
oldCurrentPage.model.save(Lang.bind(this, onModelSaved));
} else {
this._contentBox.append(this._currentPage.actor,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
}
this._updateLoadingState();
@@ -698,7 +698,7 @@ MainWindow.prototype = {
},
_pasteClipboardContent : function() {
- let clipboard = Tb.get_default_clipboard();
+ let clipboard = TheBoard.get_default_clipboard();
let onTextReceived = Lang.bind(this,
this._onClipboardTextReceived);
diff --git a/src/js/ui/page.js b/src/js/ui/page.js
index 0626ab7..06fb102 100644
--- a/src/js/ui/page.js
+++ b/src/js/ui/page.js
@@ -4,7 +4,7 @@ const Signals = imports.signals;
const Tweener = imports.tweener.tweener;
// gi imports
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
const Clutter = imports.gi.Clutter;
// ui imports
@@ -100,11 +100,11 @@ Page.prototype = {
_createMainBox : function() {
this._mainBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- reactive: true,
- name: "page-main-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ reactive: true,
+ name: "page-main-box" });
let clickAction = new Clutter.ClickAction();
@@ -130,32 +130,32 @@ Page.prototype = {
_createDimBox : function() {
this._dimBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- depth: _LAYER_DIMMING,
- opacity: 0,
- name: "page-dim-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ depth: _LAYER_DIMMING,
+ opacity: 0,
+ name: "page-dim-box" });
this._mainBox.append(this._dimBox,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._mainBox.set_fixed_child_align(this._dimBox,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.FILL);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.FILL);
},
_createSelectionBox : function() {
this._selectionBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- depth: _LAYER_SELECTION,
- visible: false,
- name: "page-selection-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ depth: _LAYER_SELECTION,
+ visible: false,
+ name: "page-selection-box" });
this._mainBox.append(this._selectionBox,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
},
_connectModelSignals : function() {
@@ -318,7 +318,7 @@ Page.prototype = {
Lang.bind(this, this._onThingSelectedChanged));
this._mainBox.append(thing.actor,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._things.push(thing);
},
@@ -899,11 +899,11 @@ Page.prototype = {
this._background.actor.opacity = 0;
this._mainBox.append(this._background.actor,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._mainBox.set_fixed_child_align(this._background.actor,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.FILL);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.FILL);
this._model.setBackground(this._background.id);
diff --git a/src/js/ui/pageButton.js b/src/js/ui/pageButton.js
index b439925..2a5c23e 100644
--- a/src/js/ui/pageButton.js
+++ b/src/js/ui/pageButton.js
@@ -7,7 +7,7 @@ const Signals = imports.signals;
const Mx = imports.gi.Mx;
const Clutter = imports.gi.Clutter;
const Pango = imports.gi.Pango;
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
function PageButton(args) {
this._init(args);
@@ -47,11 +47,11 @@ PageButton.prototype = {
_createMainBox : function() {
this._mainBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- reactive: true,
- name: this._mainBoxName });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ reactive: true,
+ name: this._mainBoxName });
let clickAction = new Clutter.ClickAction();
@@ -79,11 +79,11 @@ PageButton.prototype = {
name: "page-button-title-label" });
this._mainBox.append(this._titleLabel,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
this._mainBox.set_child_align(this._titleLabel,
- Tb.BoxAlignment.START,
- Tb.BoxAlignment.CENTER);
+ TheBoard.BoxAlignment.START,
+ TheBoard.BoxAlignment.CENTER);
},
_createRemoveButton : function() {
@@ -96,11 +96,11 @@ PageButton.prototype = {
this._removeButton.opacity = 0;
this._mainBox.append(this._removeButton,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._mainBox.set_fixed_child_align(this._removeButton,
- Tb.BoxAlignment.END,
- Tb.BoxAlignment.FILL);
+ TheBoard.BoxAlignment.END,
+ TheBoard.BoxAlignment.FILL);
},
_updateTitle : function() {
diff --git a/src/js/ui/thing.js b/src/js/ui/thing.js
index f816400..1e158b3 100644
--- a/src/js/ui/thing.js
+++ b/src/js/ui/thing.js
@@ -8,7 +8,7 @@ const Clutter = imports.gi.Clutter;
const GIO = imports.gi.Gio;
const GObject = imports.gi.GObject;
const Mx = imports.gi.Mx;
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
// util imports
const MathUtil = imports.util.mathUtil;
@@ -73,12 +73,12 @@ Thing.prototype = {
_createMainBox : function() {
this._mainBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- width: this.initialWidth,
- height: this.initialHeight,
- reactive: true });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ width: this.initialWidth,
+ height: this.initialHeight,
+ reactive: true });
this._updateSelectedStyle();
@@ -131,11 +131,11 @@ Thing.prototype = {
Lang.bind(this, this._onLinkButtonClicked));
this._mainBox.append(this._linkButton,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._mainBox.set_fixed_child_align(this._linkButton,
- Tb.BoxAlignment.START,
- Tb.BoxAlignment.START);
+ TheBoard.BoxAlignment.START,
+ TheBoard.BoxAlignment.START);
},
_createRemoveButton : function() {
@@ -150,11 +150,11 @@ Thing.prototype = {
Lang.bind(this, this._onRemoveButtonClicked));
this._mainBox.append(this._removeButton,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._mainBox.set_fixed_child_align(this._removeButton,
- Tb.BoxAlignment.END,
- Tb.BoxAlignment.START);
+ TheBoard.BoxAlignment.END,
+ TheBoard.BoxAlignment.START);
},
_createResizeButton : function() {
@@ -180,11 +180,11 @@ Thing.prototype = {
this._resizeButton.add_action(dragAction);
this._mainBox.append(this._resizeButton,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._mainBox.set_fixed_child_align(this._resizeButton,
- Tb.BoxAlignment.END,
- Tb.BoxAlignment.END);
+ TheBoard.BoxAlignment.END,
+ TheBoard.BoxAlignment.END);
},
_updatePosition : function(newX, newY) {
@@ -220,7 +220,7 @@ Thing.prototype = {
if (this._content) {
this._mainBox.append(this._content.contentActor,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
this._removeButton.raise(this._content.contentActor);
this._linkButton.raise(this._content.contentActor);
@@ -302,7 +302,7 @@ Thing.prototype = {
},
_onMainBoxDragMotion : function(action, actor, deltaX, deltaY) {
- Tb.signal_stop_emission_by_name(action, "drag-motion");
+ TheBoard.signal_stop_emission_by_name(action, "drag-motion");
this.emit("drag-motion", deltaX, deltaY);
},
@@ -349,7 +349,7 @@ Thing.prototype = {
},
_onResizeButtonDragMotion : function(action, actor, deltaX, deltaY) {
- Tb.signal_stop_emission_by_name(action, "drag-motion");
+ TheBoard.signal_stop_emission_by_name(action, "drag-motion");
let newWidth = this._mainBox.width + deltaX;
let newHeight = this._mainBox.height + deltaY;
diff --git a/src/js/ui/things/photo.js b/src/js/ui/things/photo.js
index f1e7f46..041e00a 100644
--- a/src/js/ui/things/photo.js
+++ b/src/js/ui/things/photo.js
@@ -5,7 +5,7 @@ const Mainloop = imports.mainloop;
const Tweener = imports.tweener.tweener;
// gi imports
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
const Clutter = imports.gi.Clutter;
const GLib = imports.gi.GLib;
const Gtk = imports.gi.Gtk;
@@ -78,10 +78,10 @@ PhotoThing.prototype = {
_createPhotoBox : function() {
this._photoBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- name: "photo-thing-photo-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ name: "photo-thing-photo-box" });
this._photoBox.set_style(this._style);
},
@@ -92,7 +92,7 @@ PhotoThing.prototype = {
loadAsync: true });
this._photoBox.append(this._photo,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
},
_createCaptionText : function() {
@@ -112,7 +112,7 @@ PhotoThing.prototype = {
this._onCaptionTextChanged));
this._photoBox.append(this._captionLabel,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
},
_createTapes : function() {
@@ -122,7 +122,7 @@ PhotoThing.prototype = {
filename: _TAPE_IMAGE });
this._photoBox.append(this._topTape,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._topTape.anchorX = 25;
this._topTape.anchorY = 15;
@@ -133,11 +133,11 @@ PhotoThing.prototype = {
filename: _TAPE_IMAGE });
this._photoBox.append(this._bottomTape,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._photoBox.set_fixed_child_align(this._bottomTape,
- Tb.BoxAlignment.END,
- Tb.BoxAlignment.END);
+ TheBoard.BoxAlignment.END,
+ TheBoard.BoxAlignment.END);
this._bottomTape.anchorX = -35;
this._bottomTape.anchorY = -25;
diff --git a/src/js/ui/things/sound.js b/src/js/ui/things/sound.js
index c67400e..96a91bd 100644
--- a/src/js/ui/things/sound.js
+++ b/src/js/ui/things/sound.js
@@ -5,13 +5,13 @@ const Mainloop = imports.mainloop;
const Tweener = imports.tweener.tweener;
// gi imports
-const Tb = imports.gi.Tb;
const Clutter = imports.gi.Clutter;
const GIO = imports.gi.Gio;
const GLib = imports.gi.GLib;
const Gtk = imports.gi.Gtk;
const Mx = imports.gi.Mx;
const Pango = imports.gi.Pango;
+const TheBoard = imports.gi.TheBoard;
// ui imports
const Thing = imports.ui.thing;
@@ -70,10 +70,10 @@ SoundThing.prototype = {
_createSoundBox : function() {
this._soundBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- name: "sound-thing-sound-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ name: "sound-thing-sound-box" });
this._soundBox.set_style(this._style);
@@ -82,7 +82,7 @@ SoundThing.prototype = {
},
_createSoundPlayer : function() {
- this._player = new Tb.SoundPlayer();
+ this._player = new TheBoard.SoundPlayer();
this._player.connect("notify::progress",
Lang.bind(this,
@@ -102,34 +102,34 @@ SoundThing.prototype = {
new Clutter.Texture({ filename: _CASSETE_IMAGE });
this._soundBox.append(this._casseteBg,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._soundBox.set_fixed_child_align(this._casseteBg,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.FILL);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.FILL);
},
_createContentBox : function() {
this._contentBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- name: "sound-thing-content-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ name: "sound-thing-content-box" });
this._contentBox.set_style(this._style);
this._createControlsBox();
this._soundBox.append(this._contentBox,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
},
_createControlsBox : function() {
this._controlsBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.START,
- name: "sound-thing-controls-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.START,
+ name: "sound-thing-controls-box" });
this._controlsBox.set_style(this._style);
@@ -137,21 +137,21 @@ SoundThing.prototype = {
this._createTimeLabel();
this._contentBox.append(this._controlsBox,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._contentBox.set_fixed_child_align(this._controlsBox,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.END);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.END);
},
_createPlaybackBox : function() {
this._playbackBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.CENTER,
- visible: false,
- opacity: 0,
- name: "sound-thing-playback-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.CENTER,
+ visible: false,
+ opacity: 0,
+ name: "sound-thing-playback-box" });
this._playbackBox.set_style(this._style);
@@ -159,7 +159,7 @@ SoundThing.prototype = {
this._createProgressBar();
this._controlsBox.append(this._playbackBox,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
},
_createPlayButton : function() {
@@ -174,7 +174,7 @@ SoundThing.prototype = {
this._onPlayButtonToggled));
this._playbackBox.append(this._playButton,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
},
_createProgressBar : function() {
@@ -192,11 +192,11 @@ SoundThing.prototype = {
this._onProgressBarButtonPressEvent));
this._playbackBox.append(this._progressBar,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
this._playbackBox.set_child_align(this._progressBar,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.CENTER);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.CENTER);
},
_createTimeLabel : function() {
@@ -212,19 +212,19 @@ SoundThing.prototype = {
this._updateTimeLabel(this._player.duration);
this._controlsBox.append(this._timeLabel,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
this._controlsBox.set_child_align(this._timeLabel,
- Tb.BoxAlignment.CENTER,
- Tb.BoxAlignment.END);
+ TheBoard.BoxAlignment.CENTER,
+ TheBoard.BoxAlignment.END);
},
_createCaptionText : function() {
this._captionBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- name: _CAPTION_BOX_STYLE_NORMAL });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ name: _CAPTION_BOX_STYLE_NORMAL });
this._captionBox.set_style(this._style);
@@ -245,19 +245,19 @@ SoundThing.prototype = {
this._onCaptionTextChanged));
this._captionBox.append(this._captionLabel,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
this._contentBox.append(this._captionBox,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
},
_createSpools : function() {
this._spoolsBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- y: _SPOOLS_Y,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- name: "sound-thing-spools-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ y: _SPOOLS_Y,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ name: "sound-thing-spools-box" });
this._spoolsBox.set_style(this._style);
@@ -270,15 +270,15 @@ SoundThing.prototype = {
spool.set_style(this._style);
this._spoolsBox.append(spool,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
}
this._contentBox.append(this._spoolsBox,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._contentBox.set_fixed_child_align(this._spoolsBox,
- Tb.BoxAlignment.CENTER,
- Tb.BoxAlignment.FIXED);
+ TheBoard.BoxAlignment.CENTER,
+ TheBoard.BoxAlignment.FIXED);
},
_updateSpinner : function() {
@@ -411,7 +411,7 @@ SoundThing.prototype = {
}
this._recorder =
- new Tb.SoundRecorder({ filename: filename });
+ new TheBoard.SoundRecorder({ filename: filename });
this._recorder.connect("notify::duration",
Lang.bind(this,
@@ -429,11 +429,11 @@ SoundThing.prototype = {
this._stopButton.set_style(this._style);
this._contentBox.append(this._stopButton,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._contentBox.set_fixed_child_align(this._stopButton,
- Tb.BoxAlignment.CENTER,
- Tb.BoxAlignment.FIXED);
+ TheBoard.BoxAlignment.CENTER,
+ TheBoard.BoxAlignment.FIXED);
this._recorder.start();
@@ -496,9 +496,9 @@ SoundThing.prototype = {
let parentDir = soundFile.get_parent();
if (targetDir.equal(parentDir)) {
- Tb.g_file_delete_async(soundFile, null,
- function() {},
- null);
+ TheBoard.g_file_delete_async(soundFile, null,
+ function() {},
+ null);
}
},
@@ -639,17 +639,17 @@ SoundThing.prototype = {
_onPlayerStateChanged : function() {
switch(this._player.state) {
- case Tb.SoundPlayerState.IDLE:
+ case TheBoard.SoundPlayerState.IDLE:
this._updateForSoundLoaded();
this._updateTimeLabel(this._player.duration);
break;
- case Tb.SoundPlayerState.DONE:
+ case TheBoard.SoundPlayerState.DONE:
this._updateTimeLabel(this._player.duration);
this._playButton.toggled = false;
break;
- case Tb.SoundPlayerState.ERROR:
+ case TheBoard.SoundPlayerState.ERROR:
// FIXME: show error message in the UI
break;
diff --git a/src/js/ui/things/text.js b/src/js/ui/things/text.js
index d817807..b68d559 100644
--- a/src/js/ui/things/text.js
+++ b/src/js/ui/things/text.js
@@ -4,10 +4,10 @@ const Lang = imports.lang;
const Mainloop = imports.mainloop;
// gi imports
-const Tb = imports.gi.Tb;
const Clutter = imports.gi.Clutter;
const Mx = imports.gi.Mx;
const Pango = imports.gi.Pango;
+const TheBoard = imports.gi.TheBoard;
// ui imports
const Thing = imports.ui.thing;
@@ -103,10 +103,10 @@ TextThing.prototype = {
_createBgBox : function() {
this._bgBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- name: "text-thing-bg-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ name: "text-thing-bg-box" });
if (this._style) {
this._bgBox.set_style(this._style);
@@ -122,11 +122,11 @@ TextThing.prototype = {
this._tiledBackground.filename = this._tiledBgFile;
this._bgBox.append(this._tiledBackground,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._bgBox.set_fixed_child_align(this._tiledBackground,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.FILL);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.FILL);
},
_createScrollView : function() {
@@ -152,7 +152,7 @@ TextThing.prototype = {
}
this._bgBox.append(this._scrollView,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
},
_createTextBox : function() {
@@ -161,11 +161,11 @@ TextThing.prototype = {
name: "text-thing-text-box" });
if (this._singleLine) {
- this._textBox.xAlign = Tb.BoxAlignment.START;
- this._textBox.yAlign = Tb.BoxAlignment.CENTER;
+ this._textBox.xAlign = TheBoard.BoxAlignment.START;
+ this._textBox.yAlign = TheBoard.BoxAlignment.CENTER;
} else {
- this._textBox.xAlign = Tb.BoxAlignment.FILL;
- this._textBox.yAlign = Tb.BoxAlignment.START;
+ this._textBox.xAlign = TheBoard.BoxAlignment.FILL;
+ this._textBox.yAlign = TheBoard.BoxAlignment.START;
}
if (this._style) {
@@ -214,8 +214,11 @@ TextThing.prototype = {
let [minHeight, naturalHeight] =
this._label.get_preferred_height(naturalWidth);
- let thingPadding = Tb.mx_stylable_get_padding(this.actor);
- let textBoxPadding = Tb.mx_stylable_get_padding(this._textBox);
+ let thingPadding =
+ TheBoard.mx_stylable_get_padding(this.actor);
+
+ let textBoxPadding =
+ TheBoard.mx_stylable_get_padding(this._textBox);
let newWidth = naturalWidth +
thingPadding.left + textBoxPadding.left +
diff --git a/src/js/ui/things/video.js b/src/js/ui/things/video.js
index 48a078a..40b2a42 100644
--- a/src/js/ui/things/video.js
+++ b/src/js/ui/things/video.js
@@ -5,13 +5,13 @@ const Mainloop = imports.mainloop;
const Tweener = imports.tweener.tweener;
// gi imports
-const Tb = imports.gi.Tb;
const Clutter = imports.gi.Clutter;
const ClutterGst = imports.gi.ClutterGst;
const GLib = imports.gi.GLib;
const Gtk = imports.gi.Gtk;
const Mx = imports.gi.Mx;
const Pango = imports.gi.Pango;
+const TheBoard = imports.gi.TheBoard;
// ui imports
const Thing = imports.ui.thing;
@@ -78,10 +78,10 @@ VideoThing.prototype = {
_createVideoBox : function() {
this._videoBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- name: "video-thing-video-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ name: "video-thing-video-box" });
this._videoBox.set_style(this._style);
@@ -92,15 +92,15 @@ VideoThing.prototype = {
_createContentBox : function() {
this._contentBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- name: "video-thing-content-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ name: "video-thing-content-box" });
this._contentBox.set_style(this._style);
this._videoBox.append(this._contentBox,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
},
_createStrip : function() {
@@ -110,15 +110,15 @@ VideoThing.prototype = {
filename: _STRIP_CELL_IMAGE });
this._videoBox.append(strip,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
},
_createPlaybackBox : function() {
this._playbackBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- name: "video-thing-playback-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ name: "video-thing-playback-box" });
this._playbackBox.set_style(this._style);
@@ -127,7 +127,7 @@ VideoThing.prototype = {
this._createVideoBorderBox();
this._contentBox.append(this._playbackBox,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
},
_createVideo : function() {
@@ -139,27 +139,27 @@ VideoThing.prototype = {
Lang.bind(this, this._onVideoProgressChanged));
this._playbackBox.append(this._video,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
},
_createVideoControlsBox : function() {
// This box is needed to add proper spacing between the
// video controls and the edge of video playback frame
let controlsBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.CENTER,
- name: "video-thing-controls-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.CENTER,
+ name: "video-thing-controls-box" });
controlsBox.set_style(this._style);
this._videoControlsBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.CENTER,
- opacity: 0,
- visible: false,
- name: "video-thing-video-controls-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.CENTER,
+ opacity: 0,
+ visible: false,
+ name: "video-thing-video-controls-box" });
this._videoControlsBox.set_style(this._style);
@@ -168,14 +168,14 @@ VideoThing.prototype = {
this._createTimeLabel();
controlsBox.append(this._videoControlsBox,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
this._playbackBox.append(controlsBox,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._playbackBox.set_fixed_child_align(controlsBox,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.END);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.END);
},
_createPlayButton : function() {
@@ -190,7 +190,7 @@ VideoThing.prototype = {
this._onPlayButtonToggled));
this._videoControlsBox.append(this._playButton,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
},
_createProgressBar : function() {
@@ -208,11 +208,11 @@ VideoThing.prototype = {
this._onProgressBarButtonPressEvent));
this._videoControlsBox.append(this._progressBar,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
this._videoControlsBox.set_child_align(this._progressBar,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.CENTER);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.CENTER);
},
_createTimeLabel : function() {
@@ -227,28 +227,28 @@ VideoThing.prototype = {
this._updateTimeLabel();
this._videoControlsBox.append(this._timeLabel,
- Tb.BoxPackFlags.END);
+ TheBoard.BoxPackFlags.END);
this._videoControlsBox.set_child_align(this._timeLabel,
- Tb.BoxAlignment.START,
- Tb.BoxAlignment.CENTER);
+ TheBoard.BoxAlignment.START,
+ TheBoard.BoxAlignment.CENTER);
},
_createVideoBorderBox : function() {
this._videoBorderBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- name: "video-thing-video-border-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ name: "video-thing-video-border-box" });
this._videoBorderBox.set_style(this._style);
this._playbackBox.append(this._videoBorderBox,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._playbackBox.set_fixed_child_align(this._videoBorderBox,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.FILL);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.FILL);
},
_createCaptionText : function() {
@@ -268,7 +268,7 @@ VideoThing.prototype = {
this._onCaptionTextChanged));
this._contentBox.append(this._captionLabel,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
},
_connectVideoSignals : function(fromState) {
diff --git a/src/js/ui/toolBox.js b/src/js/ui/toolBox.js
index aa8f018..20b0332 100644
--- a/src/js/ui/toolBox.js
+++ b/src/js/ui/toolBox.js
@@ -3,10 +3,10 @@ const Lang = imports.lang;
const Signals = imports.signals;
// gi imports
-const Tb = imports.gi.Tb;
const Clutter = imports.gi.Clutter;
const Mx = imports.gi.Mx;
const Pango = imports.gi.Pango;
+const TheBoard = imports.gi.TheBoard;
function ToolBox(args) {
this._init(args);
@@ -47,40 +47,40 @@ ToolBox.prototype = {
_createMainBox : function() {
this._mainBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.START,
- yAlign: Tb.BoxAlignment.FILL,
- reactive: true,
- name: "tool-box-main-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.START,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ reactive: true,
+ name: "tool-box-main-box" });
},
_createTitleBox : function() {
this._titleBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.START,
- yAlign: Tb.BoxAlignment.CENTER,
- name: "tool-box-title-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.START,
+ yAlign: TheBoard.BoxAlignment.CENTER,
+ name: "tool-box-title-box" });
this._titleLabel =
new Mx.Label({ text: this._title,
name: "tool-box-title-label" });
this._titleBox.append(this._titleLabel,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
this._mainBox.append(this._titleBox,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
},
_createButtonBox : function() {
this._buttonBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.START,
- yAlign: Tb.BoxAlignment.CENTER,
- name: "tool-box-button-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.START,
+ yAlign: TheBoard.BoxAlignment.CENTER,
+ name: "tool-box-button-box" });
this._mainBox.append(this._buttonBox,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
},
_createButtonGroup : function() {
@@ -139,7 +139,7 @@ ToolBox.prototype = {
}
this._buttonBox.append(button,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
if (this._isButtonGroup) {
this._buttonGroup.add(button);
diff --git a/src/js/ui/toolBoxPages.js b/src/js/ui/toolBoxPages.js
index 56477ef..e756e91 100644
--- a/src/js/ui/toolBoxPages.js
+++ b/src/js/ui/toolBoxPages.js
@@ -7,7 +7,7 @@ const Tweener = imports.tweener.tweener;
// gi imports
const Clutter = imports.gi.Clutter;
const Mx = imports.gi.Mx;
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
// ui imports
const PageButton = imports.ui.pageButton;
@@ -58,20 +58,20 @@ ToolBoxPages.prototype = {
_createMainBox : function() {
this._mainBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- width: _WIDTH,
- name: "tool-box-pages-main-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ width: _WIDTH,
+ name: "tool-box-pages-main-box" });
},
_createButtonBox : function() {
this._buttonBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- reactive: true,
- name: _BUTTON_BOX_NAME_NORMAL });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ reactive: true,
+ name: _BUTTON_BOX_NAME_NORMAL });
this._buttonBox.connect("notify::height",
Lang.bind(this,
@@ -85,7 +85,7 @@ ToolBoxPages.prototype = {
this._buttonBox.add_action(clickAction);
this._mainBox.append(this._buttonBox,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
},
_createPageEntry : function() {
@@ -98,11 +98,11 @@ ToolBoxPages.prototype = {
this._onPageLabelKeyPressEvent));
this._buttonBox.append(this._pageEntry,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
this._buttonBox.set_child_align(this._pageEntry,
- Tb.BoxAlignment.FILL,
- Tb.BoxAlignment.CENTER);
+ TheBoard.BoxAlignment.FILL,
+ TheBoard.BoxAlignment.CENTER);
},
_createActionButton : function() {
@@ -115,17 +115,17 @@ ToolBoxPages.prototype = {
Lang.bind(this, this._onActionButtonClicked));
this._buttonBox.append(this._actionButton,
- Tb.BoxPackFlags.END);
+ TheBoard.BoxPackFlags.END);
},
_createListBox : function() {
this._listContainerBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- width: _WIDTH + 16, // FIXME: 16 is the shadow width
- visible: false,
- name: "tool-box-pages-list-container-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ width: _WIDTH + 16, // FIXME: 16 is the shadow width
+ visible: false,
+ name: "tool-box-pages-list-container-box" });
this._listBox =
new Mx.BoxLayout({ orientation: Mx.Orientation.VERTICAL,
@@ -133,27 +133,27 @@ ToolBoxPages.prototype = {
name: "tool-box-pages-list-box" });
this._listContainerBox.append(this._listBox,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
this._buttonBox.append(this._listContainerBox,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._buttonBox.set_fixed_child_align(this._listContainerBox,
- Tb.BoxAlignment.CENTER,
- Tb.BoxAlignment.FIXED);
+ TheBoard.BoxAlignment.CENTER,
+ TheBoard.BoxAlignment.FIXED);
this._coverBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.VERTICAL,
- width: _WIDTH,
- anchorX: 2,
- name: "tool-box-pages-cover-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.VERTICAL,
+ width: _WIDTH,
+ anchorX: 2,
+ name: "tool-box-pages-cover-box" });
this._buttonBox.append(this._coverBox,
- Tb.BoxPackFlags.FIXED);
+ TheBoard.BoxPackFlags.FIXED);
this._buttonBox.set_fixed_child_align(this._coverBox,
- Tb.BoxAlignment.CENTER,
- Tb.BoxAlignment.FILL);
+ TheBoard.BoxAlignment.CENTER,
+ TheBoard.BoxAlignment.FILL);
this._coverBox.lower(null);
this._listContainerBox.lower(this._coverBox);
@@ -321,7 +321,7 @@ ToolBoxPages.prototype = {
this.setActive(true);
this._stopEditingTitle(false /* cancel changes */);
- let padding = Tb.mx_stylable_get_padding(this._buttonBox);
+ let padding = TheBoard.mx_stylable_get_padding(this._buttonBox);
this._listContainerBox.anchorX = Math.round(padding.left / 2);
this._listContainerBox.anchorY = this._listBox.height + 1;
diff --git a/src/js/ui/toolbar.js b/src/js/ui/toolbar.js
index 63b1030..d49ab6e 100644
--- a/src/js/ui/toolbar.js
+++ b/src/js/ui/toolbar.js
@@ -6,7 +6,7 @@ const Tweener = imports.tweener.tweener;
// gi imports
const Clutter = imports.gi.Clutter;
const Mx = imports.gi.Mx;
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
// ui imports
const ToolBox = imports.ui.toolBox;
@@ -56,40 +56,40 @@ Toolbar.prototype = {
_createMainBox : function() {
this._mainBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.FILL,
- yAlign: Tb.BoxAlignment.FILL,
- anchorY: this._visible ? 0 : _TOOLBOX_ANCHOR_Y,
- name: "toolbar-main-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.FILL,
+ yAlign: TheBoard.BoxAlignment.FILL,
+ anchorY: this._visible ? 0 : _TOOLBOX_ANCHOR_Y,
+ name: "toolbar-main-box" });
},
_createContentBox : function() {
this._contentBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.CENTER,
- yAlign: Tb.BoxAlignment.START,
- name: "toolbar-content-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.CENTER,
+ yAlign: TheBoard.BoxAlignment.START,
+ name: "toolbar-content-box" });
this._mainBox.append(this._contentBox,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
},
_createTitleBox : function(title) {
this._titleBox =
- new Tb.Box({ orientation: Tb.BoxOrientation.HORIZONTAL,
- xAlign: Tb.BoxAlignment.CENTER,
- yAlign: Tb.BoxAlignment.CENTER,
- name: "toolbar-title-box" });
+ new TheBoard.Box({ orientation: TheBoard.BoxOrientation.HORIZONTAL,
+ xAlign: TheBoard.BoxAlignment.CENTER,
+ yAlign: TheBoard.BoxAlignment.CENTER,
+ name: "toolbar-title-box" });
this._titleLabel =
new Mx.Label({ text: title,
name: "toolbar-title-label" });
this._titleBox.append(this._titleLabel,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
this._mainBox.append(this._titleBox,
- Tb.BoxPackFlags.EXPAND);
+ TheBoard.BoxPackFlags.EXPAND);
},
_setActiveToolBox : function(toolBox) {
@@ -159,7 +159,7 @@ Toolbar.prototype = {
Lang.bind(this, this._onToolBoxAction));
this._contentBox.append(toolBox.actor,
- Tb.BoxPackFlags.NONE);
+ TheBoard.BoxPackFlags.NONE);
this._toolBoxes.push(toolBox);
},
diff --git a/src/js/util/http.js b/src/js/util/http.js
index a5d87a3..d0b4ffc 100644
--- a/src/js/util/http.js
+++ b/src/js/util/http.js
@@ -4,7 +4,7 @@ const Lang = imports.lang;
// gi imports
const Soup = imports.gi.Soup;
-const Tb = imports.gi.Tb;
+const TheBoard = imports.gi.TheBoard;
// util imports
const JSON = imports.util.json;
@@ -29,7 +29,7 @@ function exportObject(port, iface, object) {
if (msg.requestHeaders.get_content_type(null) == "multipart/form-data") {
let [params, filename, contentType, buffer] =
Soup.form_decode_multipart(msg, "file");
- args.fileData = Tb.soup_buffer_get_data(buffer);
+ args.fileData = TheBoard.soup_buffer_get_data(buffer);
}
let result = object[method.name].apply(object, [args]);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]