kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-23 10:30:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

dateNow to date_now

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@1963 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
cfdev
2012-11-10 16:04:51 +00:00
parent d829cbf2ce
commit 42e0715fde
2 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sources/titleblockpropertieswidget.cpp
View File

@@ -27,7 +27,7 @@
*/ */
TitleBlockPropertiesWidget::TitleBlockPropertiesWidget(const TitleBlockProperties &titleblock, bool current, QWidget *parent) : TitleBlockPropertiesWidget::TitleBlockPropertiesWidget(const TitleBlockProperties &titleblock, bool current, QWidget *parent) :
QWidget(parent), QWidget(parent),
display_current_date(false), display_current_date(false),
tbt_collection_(0) tbt_collection_(0)
{ {
initWidgets(titleblock); initWidgets(titleblock);
@@ -297,13 +297,13 @@ void TitleBlockPropertiesWidget::initWidgets(const TitleBlockProperties &titlebl
connect(titleblock_fixed_date, SIGNAL(toggled(bool)), titleblock_date, SLOT(setEnabled(bool))); connect(titleblock_fixed_date, SIGNAL(toggled(bool)), titleblock_date, SLOT(setEnabled(bool)));
titleblock_date -> setCalendarPopup(true); titleblock_date -> setCalendarPopup(true);
titleblock_dateNow = new QPushButton (this); titleblock_date_now = new QPushButton (this);
titleblock_dateNow -> setEnabled(titleblock_fixed_date -> isChecked()); titleblock_date_now -> setEnabled(titleblock_fixed_date -> isChecked());
QIcon icon_dateNow(QET::Icons::ArrowLeft); QIcon icon_date_now(QET::Icons::ArrowLeft);
titleblock_dateNow -> setIcon(icon_dateNow); titleblock_date_now -> setIcon(icon_date_now);
titleblock_dateNow -> setIconSize(QSize(16, 16)); titleblock_date_now -> setIconSize(QSize(16, 16));
connect(titleblock_fixed_date, SIGNAL(toggled(bool)), titleblock_dateNow, SLOT(setEnabled(bool))); connect(titleblock_fixed_date, SIGNAL(toggled(bool)), titleblock_date_now, SLOT(setEnabled(bool)));
connect(titleblock_dateNow, SIGNAL(clicked()), this, SLOT(setDateNow())); connect(titleblock_date_now, SIGNAL(clicked()), this, SLOT(setdate_now()));
// we add a bunch of tooltips for users to know how they can put these // we add a bunch of tooltips for users to know how they can put these
// values into their title block templates // values into their title block templates
@@ -316,7 +316,7 @@ void TitleBlockPropertiesWidget::initWidgets(const TitleBlockProperties &titlebl
titleblock_current_date -> setToolTip(date_variable_tooltip); titleblock_current_date -> setToolTip(date_variable_tooltip);
titleblock_fixed_date -> setToolTip(date_variable_tooltip); titleblock_fixed_date -> setToolTip(date_variable_tooltip);
titleblock_date -> setToolTip(date_variable_tooltip); titleblock_date -> setToolTip(date_variable_tooltip);
titleblock_dateNow -> setToolTip(tr("Appliquer la date actuelle")); titleblock_date_now -> setToolTip(tr("Appliquer la date actuelle"));
folio_tip -> setToolTip(tr("%id et %total sont disponibles en tant que %{folio-id} et %{folio-total} (respectivement) pour les mod\350les de cartouches.")); folio_tip -> setToolTip(tr("%id et %total sont disponibles en tant que %{folio-id} et %{folio-total} (respectivement) pour les mod\350les de cartouches."));
// widgets for users to enter their own name/value pairs // widgets for users to enter their own name/value pairs
@@ -349,7 +349,7 @@ void TitleBlockPropertiesWidget::initLayouts() {
layout_date -> addWidget(titleblock_current_date, 1, 0); layout_date -> addWidget(titleblock_current_date, 1, 0);
layout_date -> addWidget(titleblock_fixed_date, 2, 0); layout_date -> addWidget(titleblock_fixed_date, 2, 0);
layout_date -> addWidget(titleblock_date, 2, 1); layout_date -> addWidget(titleblock_date, 2, 1);
layout_date -> addWidget(titleblock_dateNow, 2, 2); layout_date -> addWidget(titleblock_date_now, 2, 2);
layout_date -> setColumnStretch(0, 1); layout_date -> setColumnStretch(0, 1);
layout_date -> setColumnStretch(1, 500); layout_date -> setColumnStretch(1, 500);
@@ -410,8 +410,9 @@ void TitleBlockPropertiesWidget::initLayouts() {
} }
/** /**
Set the current Date to the combo Date Set the current Date to the combo Date
*/ */
void TitleBlockPropertiesWidget::setDateNow(){ void TitleBlockPropertiesWidget::setDate_now(){
titleblock_date -> setDate( QDate::currentDate() ); titleblock_date -> setDate( QDate::currentDate() );
} }

4
sources/titleblockpropertieswidget.h
View File

@@ -52,7 +52,7 @@ class TitleBlockPropertiesWidget : public QWidget {
void updateTemplateList(); void updateTemplateList();
void editCurrentTitleBlockTemplate(); void editCurrentTitleBlockTemplate();
void duplicateCurrentTitleBlockTemplate(); void duplicateCurrentTitleBlockTemplate();
void setDateNow(); void setDate_now();
private: private:
void initWidgets(const TitleBlockProperties &); void initWidgets(const TitleBlockProperties &);
@@ -73,7 +73,7 @@ class TitleBlockPropertiesWidget : public QWidget {
QLineEdit *titleblock_title; QLineEdit *titleblock_title;
QLineEdit *titleblock_author; QLineEdit *titleblock_author;
QDateEdit *titleblock_date; QDateEdit *titleblock_date;
QPushButton *titleblock_dateNow; QPushButton *titleblock_date_now;
QLineEdit *titleblock_filename; QLineEdit *titleblock_filename;
QLineEdit *titleblock_folio; QLineEdit *titleblock_folio;
QLabel *folio_tip; QLabel *folio_tip;