[gnome-documents/wip/split-view: 11/12] foo
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-documents/wip/split-view: 11/12] foo
- Date: Thu, 16 Oct 2014 11:57:36 +0000 (UTC)
commit 34fa3b3354595d7245e20f45a7c7e35d11a7c7d2
Author: Debarshi Ray <debarshir gnome org>
Date: Fri Sep 26 09:06:41 2014 +0200
foo
src/embed.js | 21 +++++++++++++++++++--
src/view.js | 2 +-
src/windowMode.js | 6 ++++--
3 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/src/embed.js b/src/embed.js
index 2056065..c87cd4d 100644
--- a/src/embed.js
+++ b/src/embed.js
@@ -231,8 +231,14 @@ const Embed = new Lang.Class({
this._stackOverlay.add_overlay(Application.notificationManager.widget);
// now create the actual content widgets
- this._view = new View.ViewContainer();
- this._stack.add_named(this._view.widget, 'view');
+ this._documents = new View.ViewContainer(WindowMode.WindowMode.DOCUMENTS);
+ this._stack.add_titled(this._documents.widget, 'documents', _("Recent"));
+
+ this._collections = new View.ViewContainer(WindowMode.WindowMode.COLLECTIONS);
+ this._stack.add_titled(this._collections.widget, 'collections', _("Collections"));
+
+ this._search = new View.ViewContainer(WindowMode.WindowMode.SEARCH);
+ this._stack.add_named(this._search.widget, 'search');
this._preview = new Preview.PreviewView(this._stackOverlay);
this._stack.add_named(this._preview.widget, 'preview');
@@ -273,6 +279,14 @@ const Embed = new Lang.Class({
Application.documentManager.connect('password-needed',
Lang.bind(this, this._onPasswordNeeded));
+ Application.searchTypeManager.connect('active-changed',
+ Lang.bind(this, this._onSearchChanged));
+ Application.sourceManager.connect('active-changed',
+ Lang.bind(this, this._onSearchChanged));
+
+ Application.searchController.connect('search-string-changed',
+ Lang.bind(this, this._onSearchChanged));
+
this._onQueryStatusChanged();
let windowMode = Application.modeController.getWindowMode();
@@ -341,6 +355,9 @@ const Embed = new Lang.Class({
this._toolbar.widget.sensitive = !fullscreen;
},
+ _onSearchChanged: function() {
+ },
+
_onWindowModeChanged: function(object, newMode, oldMode) {
switch (newMode) {
case WindowMode.WindowMode.OVERVIEW:
diff --git a/src/view.js b/src/view.js
index c84424b..929ff98 100644
--- a/src/view.js
+++ b/src/view.js
@@ -187,7 +187,7 @@ const ViewModel = new Lang.Class({
const ViewContainer = new Lang.Class({
Name: 'ViewContainer',
- _init: function() {
+ _init: function(mode) {
this._adjustmentValueId = 0;
this._adjustmentChangedId = 0;
this._scrollbarVisibleId = 0;
diff --git a/src/windowMode.js b/src/windowMode.js
index 76b3e9b..77ea4c6 100644
--- a/src/windowMode.js
+++ b/src/windowMode.js
@@ -28,9 +28,11 @@ const Application = imports.application;
const WindowMode = {
NONE: 0,
- OVERVIEW: 1,
+ DOCUMENTS: 1,
PREVIEW: 2,
- EDIT: 3
+ EDIT: 3,
+ COLLECTIONS: 4,
+ SEARCH: 5
};
const ModeController = new Lang.Class({
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]