onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-22 11:17:31 +01:00
Code Issues Releases Wiki Activity

option to show text with toolbar icons is now on by default; updated changelog and release notes

Browse Source
This commit is contained in:
Vadim Kurland 2010-06-15 03:07:35 +00:00
parent 23a6147e12
commit b437626a78
6 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 2987
#define BUILD_NUM 2989

9
doc/ChangeLog
View File

@ -1,3 +1,12 @@
2010-06-14 Roman Bovsunivkiy <a2k0001@gmail.com>
* FWBSettings.cpp (FWBSettings::init): fixed #1504 Added (optional)
text to the toolbar buttons. Text is turned on by default but
can be turned off in the global Preferences dialog.
* Preferences.cpp: fixed #1505 move "Clip comments in rules"
checkbox to "Appearance" tab.
2010-06-14 Vadim Kurland <vadim@vk.crocodile.org>
* release_notes_4.0.2.html: Added release notes for v4.0.2 to

8
src/gui/FWBSettings.cpp
View File

@ -84,6 +84,7 @@ const char* objTooltips = SETTINGS_PATH_PREFIX "/UI/objTooltips";
const char* tooltipDelay = SETTINGS_PATH_PREFIX "/UI/tooltipDelay";
const char* showUndoPanel = SETTINGS_PATH_PREFIX "/UI/showUndoPanel";
const char* userWorkflowFlags = SETTINGS_PATH_PREFIX "/UI/userWorkFlowFlags";
const char* iconsWithText = SETTINGS_PATH_PREFIX "/UI/IconWithText";
const char* emptyRCSLog = SETTINGS_PATH_PREFIX "/RCS/emptyLog";
const char* rcsFilePreviewStyle = SETTINGS_PATH_PREFIX "/RCS/FilePreviewStyle";
@ -117,6 +118,7 @@ const char* appGUID = SETTINGS_PATH_PREFIX "/ApplicationGUID";
const char* targetStatus = SETTINGS_PATH_PREFIX "/TargetStatus/";
/**
* Settings path defined here should match Windows registry paths used
* in the Windows installer/uninstaller scripts.
@ -242,6 +244,9 @@ void FWBSettings::init()
qDebug() << "Default application font:"
<< QApplication::font();
ok = contains(iconsWithText);
if (!ok) setIconsWithText(true);
ok = contains(clipComment);
if (!ok) setClipComment(true);
@ -425,6 +430,9 @@ void FWBSettings::setDontSaveStdLib( bool f) { setValue(dontSaveStdLib,f);}
bool FWBSettings::getShowUndoPanel() {return value(showUndoPanel).toBool();}
void FWBSettings::setShowUndoPanel(bool f) {setValue(showUndoPanel, f);}
bool FWBSettings::getIconsWithText() { return value(iconsWithText).toBool(); }
void FWBSettings::setIconsWithText(bool f) {setValue(iconsWithText, f);}
QByteArray FWBSettings::getUserWorkflowFlags()
{
return value(userWorkflowFlags).toByteArray();

3
src/gui/FWBSettings.h
View File

@ -250,6 +250,9 @@ class FWBSettings : public QSettings {
QByteArray getUserWorkflowFlags();
void setUserWorkflowFlags(const QByteArray &);
bool getIconsWithText();
void setIconsWithText(bool f);
private:
QFont getFontByType(const char*type);

4
src/gui/PrefsDialog.cpp
View File

@ -132,7 +132,7 @@ PrefsDialog::PrefsDialog(QWidget *parent) : QDialog(parent)
m_dialog->new_addr_tbl_run_tm->setChecked(
! st->getBool("Objects/AddressTable/useCompileTimeForNewObjects"));
m_dialog->toolbarIconsText->setChecked(st->getBool("/UI/IconWithText"));
m_dialog->toolbarIconsText->setChecked(st->getIconsWithText());
m_dialog->emptyRCSLog->setChecked( st->getRCSLogState() );
@ -412,7 +412,7 @@ void PrefsDialog::accept()
st->setBool("UI/ShowDeletedObjects", m_dialog->deletedObj->isChecked());
st->setBool("UI/ShowObjectsAttributesInTree", m_dialog->attributesInTree->isChecked());
st->setBool("/UI/IconWithText", m_dialog->toolbarIconsText->isChecked());
st->setIconsWithText(m_dialog->toolbarIconsText->isChecked());
ProjectPanel *pp = mw->activeProject();
if (pp)

15
src/res/help/en_US/release_notes_4.0.2.html
View File

@ -11,6 +11,21 @@
<ul>
<li>
<p>
fixed #1505 move "Clip comments in rules" checkbox to
"Appearance" tab.
</p>
</li>
<li>
<p>
fixed #1504 Added (optional) text to the toolbar buttons. Text
is turned on by default but can be turned off in the global
Preferences dialog.
</p>
</li>
<li>
<p>
Added release notes v4.0.1 and v4.0.2 to the package.