1.0 Release Candidate

datluong · Aug 8, 2013 · 44fb4c8 · 44fb4c8
1 parent 8e1b6a2
commit 44fb4c8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/Writer.pro b/Writer.pro
@@ -1,5  1,7 @@
 APP_NAME = Writer
 DEFINES  = QUAZIP_STATIC
 DEFINES  = QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT
 
 CONFIG  = qt warn_on cascades10
 LIBS  = -lbbdevice -lbb -lbbsystem -lbbcascadespickers
 

diff --git a/assets/DocumentBrowser.qml b/assets/DocumentBrowser.qml
@@ -12,6  12,7 @@ Page {
     property bool initialized_: false;
     property string documentPath: '/';
     property bool   documentBrowserInitialized: false;
     property bool   allowTitleUpdateHandling: true;
     property string themeRowTextColor: '';
     property string rowDividerColor: '';
     property string rowHighlightColor: '';
@@ -54,7  55,7 @@ Page {
                 backgroundVisible: false
                 focusHighlightEnabled: false
                 onTextChanged: {
-                    if (documentBrowserInitialized) {
                     if (documentBrowserInitialized && allowTitleUpdateHandling) {
                         actionUpdateFolderName();
                         // hide the virtual keyboard
                         if (!writerApp.isPhysicalKeyboardDevice())
@@ -634,14  635,16 @@ Page {
     /**
      * Bind documentPath to title field
      **/
-    function updateTitle() {
     function updateTitle() {
         allowTitleUpdateHandling = false;
         var comps = documentPath.split('/');
         if (comps.length > 0) {
             var name = comps[ comps.length - 1 ];
             if (name.length > 0) {
                 titleTextField.text = name;
             }
-        }
         }
         allowTitleUpdateHandling = true;
     }
 
     function actionOpenFolder( folderInfo, options ) {
@@ -814,7  817,7 @@ Page {
             if (entry.hasOwnProperty('name')) {
                 documentPath = entry.relativePath;
                 updateTitle();
-                folderNameChanged();
                 folderNameChanged(); // signal to parent folder
             }
             else {
                 //fail

diff --git a/assets/main.qml b/assets/main.qml
@@ -62,7  62,7 @@ NavigationPane {
             rootBrowser.applyCustomTheme( themeManager.currentTheme() );
         }
         // disable js logging
-//        console.log = function() {}        
         console.log = function() {}        
     }
 
     function experimentZone() {        

diff --git a/assets/mainEditor.qml b/assets/mainEditor.qml
@@ -45,7  45,7 @@ NavigationPane {
         rootEditor.enableSaveButton();
 
         // disable js logging
-        //        console.log = function() {}
                 console.log = function() {}
     }
 
     /**

diff --git a/bar-descriptor.xml b/bar-descriptor.xml
@@ -35,11  35,11 @@
     <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
          Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
          An updated version of application must have a versionNumber value higher than the previous version. Required. -->
-    <versionNumber>0.1.0</versionNumber>
     <versionNumber>1.0.0</versionNumber>
 
     <!-- Fourth digit segment of the package version. First three segments are taken from the 
          <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
-    <buildId>1</buildId>
     <buildId>0</buildId>
 
     <!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
     <!-- <versionLabel></versionLabel> -->

diff --git a/translations/Writer.qm b/translations/Writer.qm