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

List:       kde-commits
Subject:    extragear/utils/krecipes/src
From:       Jason Kivlighn <jkivlighn () gmail ! com>
Date:       2005-10-01 0:47:54
Message-ID: 1128127674.656027.1017.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 465857 by jkivlighn:

Remove some print code... this just isn't working out as expected and it is commented \
out for now.

 M  +10 -7     dialogs/pagesetupdialog.cpp  
 M  +1 -1      dialogs/recipeviewdialog.cpp  
 M  +2 -0      exporters/htmlexporter.cpp  
 M  +1 -1      exporters/htmlexporter.h  


--- trunk/extragear/utils/krecipes/src/dialogs/pagesetupdialog.cpp #465856:465857
@@ -75,12 +75,13 @@
 	QSize size = config->readSizeEntry( "WindowSize", &default_size );
 	resize( size );
 
-	QTabWidget *tabWidget = new QTabWidget(this);
+	//QTabWidget *tabWidget = new QTabWidget(this);
 	active_display = setup_display = new SetupDisplay( sample, false, this );
-	print_setup_display = new SetupDisplay( sample, true, this );
-	tabWidget->insertTab( setup_display, i18n("Recipe View") );
-	tabWidget->insertTab( print_setup_display, il.loadIconSet( "fileprint", \
                KIcon::Small ), i18n("Print View") );
-	layout->addWidget( tabWidget );
+	//print_setup_display = new SetupDisplay( sample, true, this );
+	//tabWidget->insertTab( setup_display, i18n("Recipe View") );
+	//tabWidget->insertTab( print_setup_display, il.loadIconSet( "fileprint", \
KIcon::Small ), i18n("Print View") ); +	//layout->addWidget( tabWidget );
+	layout->addWidget( setup_display );
 
 	initShownItems();
 
@@ -92,8 +93,8 @@
 	connect( okButton, SIGNAL( clicked() ), SLOT( accept() ) );
 	connect( cancelButton, SIGNAL( clicked() ), SLOT( reject() ) );
 	connect( setup_display, SIGNAL( itemVisibilityChanged( QWidget*, bool ) ), SLOT( \
                updateItemVisibility( QWidget*, bool ) ) );
-	connect( print_setup_display, SIGNAL( itemVisibilityChanged( QWidget*, bool ) ), \
                SLOT( updateItemVisibility( QWidget*, bool ) ) );
-	connect( tabWidget, SIGNAL( currentChanged( QWidget* ) ), SLOT( setActiveDisplay( \
QWidget* ) ) ); +	//connect( print_setup_display, SIGNAL( itemVisibilityChanged( \
QWidget*, bool ) ), SLOT( updateItemVisibility( QWidget*, bool ) ) ); +	//connect( \
tabWidget, SIGNAL( currentChanged( QWidget* ) ), SLOT( setActiveDisplay( QWidget* ) ) \
);  
 	config->setGroup( "Page Setup" ); //SetupDisplay changes the group of the config \
file  
@@ -103,10 +104,12 @@
 		filename = locate( "appdata", "layouts/default.klo" );
 	loadLayout( filename, setup_display );
 
+	#if 0
 	filename = config->readEntry( "PrintLayout", locate( "appdata", \
"layouts/default_print.klo" ) );  if ( filename.isEmpty() || !QFile::exists( filename \
) )  filename = locate( "appdata", "layouts/default_print.klo" );
 	loadLayout( filename, print_setup_display );
+	#endif
 
 	resize( size );
 }
--- trunk/extragear/utils/krecipes/src/dialogs/recipeviewdialog.cpp #465856:465857
@@ -109,7 +109,7 @@
 
 void RecipeViewDialog::print( void )
 {
-	#if 0
+	#if 1
 	if ( recipe_loaded )
 		recipeView->view() ->print();
 	#else
--- trunk/extragear/utils/krecipes/src/exporters/htmlexporter.cpp #465856:465857
@@ -56,6 +56,7 @@
 	kdDebug() << "Using layout file: " << layout_filename << endl;
 }
 
+#if 0
 HTMLExporter::HTMLExporter( RecipeDB *db, const QString& filename, const QString \
&format ) :  BaseExporter( filename, format ), database( db )
 {
@@ -73,6 +74,7 @@
 		layout_filename = locate( "appdata", "layouts/default_print.klo" );
 	kdDebug() << "Using layout file: " << layout_filename << endl;
 }
+#endif
 
 
 HTMLExporter::~HTMLExporter()
--- trunk/extragear/utils/krecipes/src/exporters/htmlexporter.h #465856:465857
@@ -74,7 +74,7 @@
 {
 public:
 	HTMLExporter( RecipeDB *, const QString&, const QString&, int width );
-	HTMLExporter( RecipeDB *, const QString&, const QString& );
+	//HTMLExporter( RecipeDB *, const QString&, const QString& );
 	virtual ~HTMLExporter();
 
 	static void removeHTMLFiles( const QString &filename, const QString &recipe_title \
);


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