anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove Dialog::title_, direct setting the title works as well.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20196 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-09-10 19:02:11 +00:00
parent 0d03e50cde
commit a17926e673
9 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/frontends/controllers/Dialog.cpp
View File

@ -125,6 +125,12 @@ void Dialog::setController(Controller * controller)
controller_ = controller;
}
Controller & Dialog::controller() const
{
BOOST_ASSERT(controller_);
return *controller_;
}
Controller::Controller(Dialog & parent)
: parent_(parent)
@ -139,24 +145,5 @@ bool Controller::canApply() const
}
Controller & Dialog::controller() const
{
BOOST_ASSERT(controller_);
return *controller_;
}
void Dialog::setViewTitle(docstring const & newtitle)
{
title_ = newtitle;
}
docstring const & Dialog::getViewTitle() const
{
return title_;
}
} // namespace frontend
} // namespace lyx

6
src/frontends/controllers/Dialog.h
View File

@ -146,10 +146,6 @@ public:
*/
virtual void partialUpdateView(int /*id*/) {}
/// sets the title of the dialog (window caption)
void setViewTitle(docstring const &);
/// gets the title of the dialog (window caption)
docstring const & getViewTitle() const;
///
std::string name() const { return name_; }
@ -168,8 +164,6 @@ protected:
*/
std::string name_;
Controller * controller_;
docstring title_;
};

2
src/frontends/qt4/GuiCitation.cpp
View File

@ -74,8 +74,6 @@ GuiCitationDialog::GuiCitationDialog(LyXView & lv)
setViewTitle(_("Citation"));
setController(new ControlCitation(*this));
setWindowTitle(toqstr("LyX: " + getViewTitle()));
connect(citationStyleCO, SIGNAL(activated(int)),
this, SLOT(changed()));
connect(fulllistCB, SIGNAL(clicked()),

1
src/frontends/qt4/GuiDelimiter.cpp
View File

@ -66,7 +66,6 @@ GuiDelimiterDialog::GuiDelimiterDialog(LyXView & lv)
connect(closePB, SIGNAL(clicked()), this, SLOT(accept()));
setWindowTitle(qt_("LyX: Delimiters"));
setFocusProxy(leftLW);
leftLW->setViewMode(QListView::IconMode);

8
src/frontends/qt4/GuiDialog.cpp
View File

@ -22,6 +22,12 @@ GuiDialog::GuiDialog(LyXView & lv, std::string const & name)
{}
void GuiDialog::setViewTitle(docstring const & title)
{
setWindowTitle("LyX: " + toqstr(title));
}
void GuiDialog::setButtonsValid(bool valid)
{
bc().setValid(valid);
@ -140,8 +146,6 @@ void GuiDialog::showView()
if (controller().exitEarly())
return;
setWindowTitle(toqstr("LyX: " + getViewTitle()));
if (QWidget::isVisible()) {
raise();
activateWindow();

2
src/frontends/qt4/GuiDialog.h
View File

@ -79,6 +79,8 @@ public:
void preUpdate();
void postUpdate();
void setViewTitle(docstring const & title);
///
bool readOnly() const;

6
src/frontends/qt4/GuiEmbeddedFiles.cpp
View File

@ -21,12 +21,12 @@ namespace lyx {
namespace frontend {
GuiEmbeddedFilesDialog::GuiEmbeddedFilesDialog(ControlEmbeddedFiles & controller)
GuiEmbeddedFilesDialog::GuiEmbeddedFilesDialog
(ControlEmbeddedFiles & controller)
: controller_(controller)
{
setupUi(this);
setWindowTitle(qt_("Embedded Files"));
setWindowTitle("LyX: " + qt_("Embedded Files"));
updateView();
}

2
src/frontends/qt4/GuiMathMatrix.cpp
View File

@ -36,8 +36,6 @@ GuiMathMatrixDialog::GuiMathMatrixDialog(LyXView & lv)
setViewTitle(_("Math Matrix"));
setController(new ControlMath(*this));
setWindowTitle(qt_("LyX: Insert Matrix"));
table->setMinimumSize(100, 100);
rowsSB->setValue(5);
columnsSB->setValue(5);

5
src/frontends/qt4/LyXFileDialog.cpp
View File

@ -27,11 +27,12 @@ using std::string;
namespace lyx {
/// return the Qt form of the label
static docstring const getLabel(docstring const & ucs4str) {
static docstring const getLabel(docstring const & ucs4str)
{
// FIXME UNICODE
string str = to_utf8(ucs4str);
string label;
string sc(split(str, label, '|'));
string sc = split(str, label, '|');
if (sc.length() < 2)
return from_utf8(label);
string::size_type pos = label.find(sc[1]);