Wordcount visibility handling on Keyboard devices

datluong · Aug 2, 2013 · 119cb2a · 119cb2a
1 parent ce3ce14
commit 119cb2a
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 21 deletions.
diff --git a/Writer.pro b/Writer.pro
@@ -1,7  1,7 @@
 APP_NAME = Writer
 
 CONFIG  = qt warn_on cascades10
-LIBS  = -lbbdevice
 LIBS  = -lbbdevice -lbb
 
 include(config.pri)
 

diff --git a/assets/Editor.qml b/assets/Editor.qml
@@ -1,15  1,21 @@
 import bb.cascades 1.0
-import QtQuick 1.0
 import my.timer 1.0
 
 Page {
     id: editorPage
     objectName: "editorPage"
     actionBarAutoHideBehavior: ActionBarAutoHideBehavior.Disabled
     actionBarVisibility: ChromeVisibility.Hidden
 
     property string documentTitle: '';
     property string documentPath: '';
     property bool   readyForEditing: false;
     property bool   documentChanged: false;
     property bool   compactWordCountView: false;
     property bool   wordCountBarHidden: false;
     property bool   timerActive: false;
     property double lastStrokeTime: 0;
     property double wordCountBarIdleTime: 2500;
 
     signal documentTitleUpdated(string newTitle);
 
@@ -44,7  50,6 @@ Page {
                         onTextChanging: {
                             documentChanged = true;
                             if (text.length > 0 && text.indexOf("\n") == text.length-1) {
-                                console.log('enter key detected');
                                 // remove the enterKey
                                 titleTextArea.text = text.substring(0, text.length-1) ;                               
                                 focusEditor();
@@ -75,7  80,11 @@ Page {
                         implicitLayoutAnimationsEnabled: false
                         onTextChanging: {          
                             documentChanged = true;
-                            updateWordCount(wordCount(text));
                             updateWordCount(wordCount(text));
 
                             if (compactWordCountView && readyForEditing) {
                                 hideWordCountBar();
                             }
                         }
                         onFocusedChanged: {
                             if (focused)
@@ -92,7  101,7 @@ Page {
             } // end Editor Container
         } // end ScrollView
         Container {
-            id: controllerContainer
             id: wordCountBar
 
             preferredHeight: 52
             rightPadding: 8
@@ -133,10  142,21 @@ Page {
                 }
             }
         } // end Controller Container
-    } // end Root Container 
     } // end Root Container
 
     attachedObjects: [
         QTimer {
             id: editorTimer
             singleShot: false
             interval: 1000            
             onTimeout: {
                 updateWordCountBarVisibility();
             }
         }
     ]
 
     function updateWordCount(count) {        
-        var t = ''   count   ( compactWordCountView? ' w' : (count < 2 ? ' word' : ' words'));
         var t = ''   count   (count < 2 ? ' word' : ' words');
         wordCountLabel.setText( t );        
     }
 
@@ -149,15  169,58 @@ Page {
     }
 
     onCreationCompleted: {
-//        compactWordCountView = writerApp.isPhysicalKeyboardDevice();
-        if (compactWordCountView) {
-//            wordCountIcon.visible = false;
-//            controllerContainer.rightPadding = 6;
         compactWordCountView = writerApp.isPhysicalKeyboardDevice();
         if (compactWordCountView) {
             editorTimer.start();
             timerActive = true;
         }
 
-        updateWordCount( wordCount(editorTextArea.text) );
         updateWordCount( wordCount(editorTextArea.text) );                
     }
 
     ///////////////////////////////////////////////////////////////////////////
     // Q10/Q5 WordCountBar visibility handling
      function onFullscreen() {
         if (compactWordCountView && timerActive === false) {
             timerActive = true;
             editorTimer.start();
             console.log('editorTimer is started');
         }        
     }
 
     function onThumbnailed() {
         if (compactWordCountView && timerActive) {
             timerActive = false;
             editorTimer.stop();
             console.log('editorTimer is stopped');
         }
     }
 
     function hideWordCountBar() {
         var now = new Date();
         lastStrokeTime = now.getTime();
         if (wordCountBarHidden) return;
 
         wordCountBarHidden = true;
         wordCountBar.opacity = 0;         
     }
 
     function updateWordCountBarVisibility() {
         if (wordCountBarHidden === false) return;
 
         var now = (new Date()).getTime();
         if (now > lastStrokeTime   wordCountBarIdleTime) {
             // show wordCountBar
             wordCountBarHidden = false;
             wordCountBar.opacity = 1;
         }
         else if (now < lastStrokeTime) {
             lastStrokeTime = now;
         }
 
     } 
     ///////////////////////////////////////////////////////////////////////////
 
     function textFieldGotFocus() {
         if (editorPage.actionBarVisibility != ChromeVisibility.Hidden)
             editorPage.actionBarVisibility = ChromeVisibility.Hidden;
@@ -187,6  250,7 @@ Page {
 
     function beginEditing() {
         documentChanged = false;
         readyForEditing = true;
     }
     /**
      * Save document

diff --git a/src/writely/WriterUI.cpp b/src/writely/WriterUI.cpp
@@ -26,6  26,7 @@ WriterUI::WriterUI(bb::cascades::Application *app)
 
 	// filesystem initialization
 	initializeDocumentFolder();
 	qmlRegisterType<QTimer>("my.timer", 1, 0, "QTimer");
 
     // create scene document from main.qml asset
     // set parent to created document to ensure it exists for the whole application lifetime
@@ -40,6  41,8 @@ WriterUI::WriterUI(bb::cascades::Application *app)
     qDebug() << "rootPane" << (mRootNavigationPane!=NULL);
 
     connect( app, SIGNAL(aboutToQuit()), this, SLOT(onAppAboutToQuit()) );
     connect( app, SIGNAL(thumbnail()),   this, SLOT(onAppThumbnailed()) );
     connect( app, SIGNAL(fullscreen()),  this, SLOT(onAppFullscreen()) );
 
     initializeAutosave();
 }
@@ -446,20  449,28 @@ bool WriterUI::isPhysicalKeyboardDevice() {
 
 void WriterUI::onAppAboutToQuit() {
 	qDebug() << "WriterUI::onAppAboutToQuit()";
-//	qDebug() << "Pages Count:" << mRootNavigationPane->count();
-//	if (mRootNavigationPane->count() > 0) {
-//		Page* page = mRootNavigationPane->at( mRootNavigationPane->count()-1 );
-//		if (page) {
-//			if ( page->objectName() == "editorPage" ) {
-//				QMetaObject::invokeMethod(page, "handleAppExitEvent" );
-//			}
-//		}
-//	}
 	Page* page = currentEditorPage();
 	if (page)
 		QMetaObject::invokeMethod(page, "handleAppExitEvent" );
 }
 
 //connect( app, SIGNAL(thumbnail()),   this, SLOT(onAppThumbnailed()) );
 //connect( app, SIGNAL(fullscreen()),  this, SLOT(onAppFullscreen()) );
 
 void WriterUI::onAppThumbnailed() {
 	qDebug() << "WriterUI::onAppThumbnailed()";
 	Page* page = currentEditorPage();
 	if (page)
 		QMetaObject::invokeMethod(page, "onThumbnailed" );
 }
 
 void WriterUI::onAppFullscreen() {
 	qDebug() << "WriterUI::onAppFullscreen";
 	Page* page = currentEditorPage();
 	if (page)
 		QMetaObject::invokeMethod(page, "onFullscreen" );
 }
 
 /**
  * Fire after a certain period of time
  */
@@ -469,4  480,5 @@ void WriterUI::onAutosaveTimerTimeout() {
 		QMetaObject::invokeMethod(page, "handleAutoSaveEvent" );
 }
 
 
 } // end namespace
diff --git a/src/writely/WriterUI.hpp b/src/writely/WriterUI.hpp
@@ -59,6  59,8 @@ class WriterUI : public QObject
 private slots:
 	void onAppAboutToQuit();
 	void onAutosaveTimerTimeout();
 	void onAppThumbnailed();
 	void onAppFullscreen();
 
 };