From 9321b80905bca48d49a6b12a4d463c268736b166 Mon Sep 17 00:00:00 2001 From: Harishankar Date: Mon, 29 Nov 2010 22:37:19 +0530 Subject: [PATCH] Created the site generate dialog Created the site generation dialog. Still to implement the actual site generation. --- generate_dialog.py | 13 +++ generate_dialog.ui | 217 ++++++++++++++++++++++++++++++++++++++++++ main_window.py | 11 +++ main_window.ui | 18 +++- ui_generate_dialog.py | 124 ++++++++++++++++++++++++ ui_main_window.py | 4 +- 6 files changed, 384 insertions(+), 3 deletions(-) create mode 100644 generate_dialog.py create mode 100644 generate_dialog.ui create mode 100644 ui_generate_dialog.py diff --git a/generate_dialog.py b/generate_dialog.py new file mode 100644 index 0000000..0d7bbed --- /dev/null +++ b/generate_dialog.py @@ -0,0 +1,13 @@ +# BiaWeb Website content manager (c) 2010 V.Harishankar +# Generate site dialog + +import PyQt4 +import ui_generate_dialog + +class GenerateDialog (PyQt4.QtGui.QDialog, ui_generate_dialog.Ui_SiteGenerateDialog): + def __init__ (self, master, currentdb): + PyQt4.QtGui.QDialog.__init__ (self, master) + self.setupUi (self) + + # set the database + self.current_db = currentdb diff --git a/generate_dialog.ui b/generate_dialog.ui new file mode 100644 index 0000000..21a3928 --- /dev/null +++ b/generate_dialog.ui @@ -0,0 +1,217 @@ + + + SiteGenerateDialog + + + + 0 + 0 + 618 + 537 + + + + + 618 + 537 + + + + + 618 + 537 + + + + Generate Website + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +Important Information +This will generate your website in the destination directory specified in the site configuration dialog. The entire directory tree will be re-created from scratch and any manual changes you made to the generated files will be gone! + +You need to re-copy additional files/folders you require in the destination folder (e.g. image files or directories) every time you generate the site. Specify additional files/folders to copy below.</body></html> + + + true + + + + + + + 0 + + + + Files + + + + + + Additional files to add to destination + + + + + + + &Add file + + + + + + + &Remove + + + + + + + + Source file + + + + + Destination (relative to dest-dir) + + + + + + + + + Folders + + + + + + Additional folders to add to destination + + + + + + + &Add folder + + + + + + + &Remove + + + + + + + + Source folder + + + + + Destination (relative to dest-dir) + + + + + + + + + + + + Search index type + + + + + + Full text index + + + true + + + + + + + Keyword index + + + false + + + + + + + + + + &Generate site + + + true + + + + + + + &Close + + + + + + + tabWidget + addfile + removefile + additional_files + addfolder + removefolder + additional_folders + fulltextindex + keywordindex + generate_site + close + + + + + close + clicked() + SiteGenerateDialog + reject() + + + 502 + 516 + + + 239 + 501 + + + + + diff --git a/main_window.py b/main_window.py index 6b7f31a..bf22310 100644 --- a/main_window.py +++ b/main_window.py @@ -9,6 +9,7 @@ import site_configuration_dialog as scd import category_dialog as catd import article_dialog as artd import templates_dialog as tpld +import generate_dialog as gend import biaweb_db class MainWindow (PyQt4.QtGui.QMainWindow, ui_main_window.Ui_MainWindow): @@ -362,6 +363,16 @@ class MainWindow (PyQt4.QtGui.QMainWindow, ui_main_window.Ui_MainWindow): else: PyQt4.QtGui.QMessageBox.critical (self, "Error", "System or SQLite 3 error in creating database") + # when generate site menu is triggered + def onGenerateSite (self): + if self.current_db is None: + PyQt4.QtGui.QMessageBox.critical (self, "Error", + "Cannot generate site. You need to create or open a website first") + else: + # run the generate site dialog + gendlg = gend.GenerateDialog (self, self.current_db) + gendlg.exec_ () + # file quit is clicked def onFileQuit (self): sys.exit (0) diff --git a/main_window.ui b/main_window.ui index bbdfa1f..36b25cd 100644 --- a/main_window.ui +++ b/main_window.ui @@ -127,7 +127,6 @@ &Export web - @@ -533,6 +532,22 @@ + + action_Generate_Site + triggered() + MainWindow + onGenerateSite() + + + -1 + -1 + + + 398 + 258 + + + onFileNew() @@ -550,5 +565,6 @@ onCategoryItemActivated() onArticleItemActivated() onTemplates() + onGenerateSite() diff --git a/ui_generate_dialog.py b/ui_generate_dialog.py new file mode 100644 index 0000000..a14ac37 --- /dev/null +++ b/ui_generate_dialog.py @@ -0,0 +1,124 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'generate_dialog.ui' +# +# Created: Mon Nov 29 22:36:32 2010 +# by: PyQt4 UI code generator 4.7.4 +# +# WARNING! All changes made in this file will be lost! + +from PyQt4 import QtCore, QtGui + +class Ui_SiteGenerateDialog(object): + def setupUi(self, SiteGenerateDialog): + SiteGenerateDialog.setObjectName("SiteGenerateDialog") + SiteGenerateDialog.resize(618, 537) + SiteGenerateDialog.setMinimumSize(QtCore.QSize(618, 537)) + SiteGenerateDialog.setMaximumSize(QtCore.QSize(618, 537)) + self.gridLayout_2 = QtGui.QGridLayout(SiteGenerateDialog) + self.gridLayout_2.setObjectName("gridLayout_2") + self.label = QtGui.QLabel(SiteGenerateDialog) + self.label.setWordWrap(True) + self.label.setObjectName("label") + self.gridLayout_2.addWidget(self.label, 0, 0, 1, 3) + self.tabWidget = QtGui.QTabWidget(SiteGenerateDialog) + self.tabWidget.setObjectName("tabWidget") + self.tab = QtGui.QWidget() + self.tab.setObjectName("tab") + self.gridLayout_3 = QtGui.QGridLayout(self.tab) + self.gridLayout_3.setObjectName("gridLayout_3") + self.label_2 = QtGui.QLabel(self.tab) + self.label_2.setObjectName("label_2") + self.gridLayout_3.addWidget(self.label_2, 0, 0, 1, 1) + self.addfile = QtGui.QPushButton(self.tab) + self.addfile.setObjectName("addfile") + self.gridLayout_3.addWidget(self.addfile, 0, 1, 1, 1) + self.removefile = QtGui.QPushButton(self.tab) + self.removefile.setObjectName("removefile") + self.gridLayout_3.addWidget(self.removefile, 0, 2, 1, 1) + self.additional_files = QtGui.QTreeWidget(self.tab) + self.additional_files.setObjectName("additional_files") + self.gridLayout_3.addWidget(self.additional_files, 1, 0, 1, 3) + self.tabWidget.addTab(self.tab, "") + self.tab_2 = QtGui.QWidget() + self.tab_2.setObjectName("tab_2") + self.gridLayout_4 = QtGui.QGridLayout(self.tab_2) + self.gridLayout_4.setObjectName("gridLayout_4") + self.label_3 = QtGui.QLabel(self.tab_2) + self.label_3.setObjectName("label_3") + self.gridLayout_4.addWidget(self.label_3, 0, 0, 1, 1) + self.addfolder = QtGui.QPushButton(self.tab_2) + self.addfolder.setObjectName("addfolder") + self.gridLayout_4.addWidget(self.addfolder, 0, 1, 1, 1) + self.removefolder = QtGui.QPushButton(self.tab_2) + self.removefolder.setObjectName("removefolder") + self.gridLayout_4.addWidget(self.removefolder, 0, 2, 1, 1) + self.additional_folders = QtGui.QTreeWidget(self.tab_2) + self.additional_folders.setObjectName("additional_folders") + self.gridLayout_4.addWidget(self.additional_folders, 1, 0, 1, 3) + self.tabWidget.addTab(self.tab_2, "") + self.gridLayout_2.addWidget(self.tabWidget, 1, 0, 1, 3) + self.groupBox = QtGui.QGroupBox(SiteGenerateDialog) + self.groupBox.setObjectName("groupBox") + self.gridLayout = QtGui.QGridLayout(self.groupBox) + self.gridLayout.setObjectName("gridLayout") + self.fulltextindex = QtGui.QRadioButton(self.groupBox) + self.fulltextindex.setChecked(True) + self.fulltextindex.setObjectName("fulltextindex") + self.gridLayout.addWidget(self.fulltextindex, 0, 0, 1, 1) + self.keywordindex = QtGui.QRadioButton(self.groupBox) + self.keywordindex.setChecked(False) + self.keywordindex.setObjectName("keywordindex") + self.gridLayout.addWidget(self.keywordindex, 0, 1, 1, 1) + self.gridLayout_2.addWidget(self.groupBox, 2, 0, 1, 1) + self.generate_site = QtGui.QPushButton(SiteGenerateDialog) + self.generate_site.setDefault(True) + self.generate_site.setObjectName("generate_site") + self.gridLayout_2.addWidget(self.generate_site, 3, 1, 1, 1) + self.close = QtGui.QPushButton(SiteGenerateDialog) + self.close.setObjectName("close") + self.gridLayout_2.addWidget(self.close, 3, 2, 1, 1) + + self.retranslateUi(SiteGenerateDialog) + self.tabWidget.setCurrentIndex(0) + QtCore.QObject.connect(self.close, QtCore.SIGNAL("clicked()"), SiteGenerateDialog.reject) + QtCore.QMetaObject.connectSlotsByName(SiteGenerateDialog) + SiteGenerateDialog.setTabOrder(self.tabWidget, self.addfile) + SiteGenerateDialog.setTabOrder(self.addfile, self.removefile) + SiteGenerateDialog.setTabOrder(self.removefile, self.additional_files) + SiteGenerateDialog.setTabOrder(self.additional_files, self.addfolder) + SiteGenerateDialog.setTabOrder(self.addfolder, self.removefolder) + SiteGenerateDialog.setTabOrder(self.removefolder, self.additional_folders) + SiteGenerateDialog.setTabOrder(self.additional_folders, self.fulltextindex) + SiteGenerateDialog.setTabOrder(self.fulltextindex, self.keywordindex) + SiteGenerateDialog.setTabOrder(self.keywordindex, self.generate_site) + SiteGenerateDialog.setTabOrder(self.generate_site, self.close) + + def retranslateUi(self, SiteGenerateDialog): + SiteGenerateDialog.setWindowTitle(QtGui.QApplication.translate("SiteGenerateDialog", "Generate Website", None, QtGui.QApplication.UnicodeUTF8)) + self.label.setText(QtGui.QApplication.translate("SiteGenerateDialog", "\n" +"\n" +"

Important Information

\n" +"

This will generate your website in the destination directory specified in the site configuration dialog. The entire directory tree will be re-created from scratch and any manual changes you made to the generated files will be gone!

\n" +"

You need to re-copy additional files/folders you require in the destination folder (e.g. image files or directories) every time you generate the site. Specify additional files/folders to copy below.

", None, QtGui.QApplication.UnicodeUTF8)) + self.label_2.setText(QtGui.QApplication.translate("SiteGenerateDialog", "Additional files to add to destination", None, QtGui.QApplication.UnicodeUTF8)) + self.addfile.setText(QtGui.QApplication.translate("SiteGenerateDialog", "&Add file", None, QtGui.QApplication.UnicodeUTF8)) + self.removefile.setText(QtGui.QApplication.translate("SiteGenerateDialog", "&Remove", None, QtGui.QApplication.UnicodeUTF8)) + self.additional_files.headerItem().setText(0, QtGui.QApplication.translate("SiteGenerateDialog", "Source file", None, QtGui.QApplication.UnicodeUTF8)) + self.additional_files.headerItem().setText(1, QtGui.QApplication.translate("SiteGenerateDialog", "Destination (relative to dest-dir)", None, QtGui.QApplication.UnicodeUTF8)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), QtGui.QApplication.translate("SiteGenerateDialog", "Files", None, QtGui.QApplication.UnicodeUTF8)) + self.label_3.setText(QtGui.QApplication.translate("SiteGenerateDialog", "Additional folders to add to destination", None, QtGui.QApplication.UnicodeUTF8)) + self.addfolder.setText(QtGui.QApplication.translate("SiteGenerateDialog", "&Add folder", None, QtGui.QApplication.UnicodeUTF8)) + self.removefolder.setText(QtGui.QApplication.translate("SiteGenerateDialog", "&Remove", None, QtGui.QApplication.UnicodeUTF8)) + self.additional_folders.headerItem().setText(0, QtGui.QApplication.translate("SiteGenerateDialog", "Source folder", None, QtGui.QApplication.UnicodeUTF8)) + self.additional_folders.headerItem().setText(1, QtGui.QApplication.translate("SiteGenerateDialog", "Destination (relative to dest-dir)", None, QtGui.QApplication.UnicodeUTF8)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), QtGui.QApplication.translate("SiteGenerateDialog", "Folders", None, QtGui.QApplication.UnicodeUTF8)) + self.groupBox.setTitle(QtGui.QApplication.translate("SiteGenerateDialog", "Search index type", None, QtGui.QApplication.UnicodeUTF8)) + self.fulltextindex.setText(QtGui.QApplication.translate("SiteGenerateDialog", "Full text index", None, QtGui.QApplication.UnicodeUTF8)) + self.keywordindex.setText(QtGui.QApplication.translate("SiteGenerateDialog", "Keyword index", None, QtGui.QApplication.UnicodeUTF8)) + self.generate_site.setText(QtGui.QApplication.translate("SiteGenerateDialog", "&Generate site", None, QtGui.QApplication.UnicodeUTF8)) + self.close.setText(QtGui.QApplication.translate("SiteGenerateDialog", "&Close", None, QtGui.QApplication.UnicodeUTF8)) + diff --git a/ui_main_window.py b/ui_main_window.py index 80a6898..d754224 100644 --- a/ui_main_window.py +++ b/ui_main_window.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'main_window.ui' # -# Created: Mon Nov 29 13:18:40 2010 +# Created: Mon Nov 29 22:29:43 2010 # by: PyQt4 UI code generator 4.7.4 # # WARNING! All changes made in this file will be lost! @@ -108,7 +108,6 @@ class Ui_MainWindow(object): self.menu_Content.addAction(self.action_EditCategory) self.menu_Content.addAction(self.action_RemoveCategory) self.menu_Export_web.addAction(self.action_Generate_Site) - self.menu_Export_web.addAction(self.actionGenerate_Search_Index) self.menu_File_2.addAction(self.actionNew_site) self.menu_File_2.addAction(self.action_Open_site) self.menu_File_2.addSeparator() @@ -138,6 +137,7 @@ class Ui_MainWindow(object): QtCore.QObject.connect(self.categories, QtCore.SIGNAL("itemActivated(QTreeWidgetItem*,int)"), MainWindow.onCategoryItemActivated) QtCore.QObject.connect(self.articles, QtCore.SIGNAL("itemActivated(QTreeWidgetItem*,int)"), MainWindow.onArticleItemActivated) QtCore.QObject.connect(self.actionTemplates, QtCore.SIGNAL("triggered()"), MainWindow.onTemplates) + QtCore.QObject.connect(self.action_Generate_Site, QtCore.SIGNAL("triggered()"), MainWindow.onGenerateSite) QtCore.QMetaObject.connectSlotsByName(MainWindow) MainWindow.setTabOrder(self.categories, self.articles) -- 2.20.1