[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krecipes] src/dialogs/recipeinput: Set the new editor as default.
From:       José_Manuel_Santamaría_Lema <panfaust () gmail ! com>
Date:       2016-04-01 13:27:31
Message-ID: E1alz6p-0003Wm-Qb () scm ! kde ! org
[Download RAW message or body]

Git commit 021976224c167003032e4af08df88369411275f2 by José Manuel Santamaría Lema.
Committed on 01/04/2016 at 11:01.
Pushed by joselema into branch 'master'.

Set the new editor as default.

There are still things to be implemented/fixed in the new editor but it's
good enough for git/master.
BUG: 285826
BUG: 289334
FIXED-IN: 2.2

M  +4    -4    src/dialogs/recipeinput/recipeinputdialog.cpp

http://commits.kde.org/krecipes/021976224c167003032e4af08df88369411275f2

diff --git a/src/dialogs/recipeinput/recipeinputdialog.cpp \
b/src/dialogs/recipeinput/recipeinputdialog.cpp index 6b0be99..eb12111 100644
--- a/src/dialogs/recipeinput/recipeinputdialog.cpp
+++ b/src/dialogs/recipeinput/recipeinputdialog.cpp
@@ -97,7 +97,7 @@ RecipeInputDialog::RecipeInputDialog( QWidget* parent, RecipeDB *db \
) : KVBox( p  
 	//------- Ingredients Tab -----------------
 
-	ingredientsTab = new QFrame( this );
+	ingredientsTab = new QFrame;
 	ingredientsTab->setFrameStyle( QFrame::NoFrame );
 	ingredientsTab->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, \
QSizePolicy::MinimumExpanding ) );  QGridLayout* ingredientsLayout = new QGridLayout( \
ingredientsTab ); @@ -245,11 +245,11 @@ RecipeInputDialog::RecipeInputDialog( \
QWidget* parent, RecipeDB *db ) : KVBox( p  
 
 	tabWidget->insertTab( -1, m_recipeGeneralInfoEditor, i18nc( "@title:tab", "Recipe" \
                ) );
-	tabWidget->insertTab( -1, ingredientsTab, i18nc( "@title:tab", "Ingredients" ) );
+	//TODO: Remove this after removing the old editor code
+	//tabWidget->insertTab( -1, ingredientsTab, i18nc( "@title:tab", "Ingredients" ) );
 	ingredientsEditor = new IngredientsEditor;
 	ingredientsEditor->setDatabase( database );
-	//TODO: uncomment this to try the new ingredients editor
-	//tabWidget->insertTab( -1, ingredientsEditor, i18nc( "@title:tab", "Ingredients" ) \
); +	tabWidget->insertTab( -1, ingredientsEditor, i18nc( "@title:tab", "Ingredients" \
) );  tabWidget->insertTab( -1, instructionsTab, i18nc( "@title:tab", "Instructions" \
) );  tabWidget->insertTab( -1, ratingListEditor, i18nc( "@title:tab", "Ratings" ) );
 


[prev in list] [next in list] [prev in thread] [next in thread]