Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3134 → Rev 3135

/branches/Version13x/Scribus/scribus/mpalette.h
396,7 → 396,7
void Stellung(int);
void EditCL();
void EditLSt();
void NewTF(QString);
void NewTF(const QString&);
void UpdtGui(int);
 
protected:
/branches/Version13x/Scribus/scribus/mpalette.cpp
2548,7 → 2548,6
if (ScApp->ScriptRunning)
return;
emit Stellung(s);
emit BackHome();
}
 
void Mpalette::newShadowOffs()
/branches/Version13x/Scribus/scribus/editformats.cpp
99,11 → 99,9
layout2 = new QHBoxLayout( 0, 0, 5, "layout2");
QSpacerItem* spacer1 = new QSpacerItem( 71, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout2->addItem( spacer1 );
OkButton = new QPushButton( this, "OkButton" );
OkButton->setText( tr( "OK" ) );
OkButton = new QPushButton( CommonStrings::tr_OK, this, "OkButton" );
layout2->addWidget( OkButton );
CancelButton = new QPushButton( this, "CancelButton" );
CancelButton->setText( tr( "Cancel" ) );
CancelButton = new QPushButton( CommonStrings::tr_Cancel, this, "CancelButton" );
layout2->addWidget( CancelButton );
ChooseStylesLayout->addLayout( layout2 );
resize(230, 280);
171,7 → 169,7
connect(DublicateB, SIGNAL(clicked()), this, SLOT(dupFormat()));
connect(DeleteB, SIGNAL(clicked()), this, SLOT(deleteFormat()));
connect(ListBox1, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selFormat(QListBoxItem*)));
connect( ListBox1, SIGNAL( selected(QListBoxItem*) ), this, SLOT( selEditFormat(QListBoxItem*) ) );
connect(ListBox1, SIGNAL(selected(QListBoxItem*)), this, SLOT(selEditFormat(QListBoxItem*)));
TempVorl = doc->docParagraphStyles;
UpdateFList();
}
312,7 → 310,7
{
int exit=QMessageBox::warning(this,
tr("Warning"),
tr("Do you really want to delete this Style?"),
tr("Do you really want to delete this style?"),
tr("No"),
tr("Yes"),
0, 0, 0);
/branches/Version13x/Scribus/scribus/story.cpp
27,8 → 27,8
#include <qfontdialog.h>
#include <qcursor.h>
#include <qtextcodec.h>
#include "serializer.h"
#include "customfdialog.h"
#include "editformats.h"
#include "search.h"
#include "scribus.h"
#include "prefscontext.h"
36,6 → 36,7
#include "charselect.h"
#include "pluginmanager.h"
#include "pageitem.h"
#include "serializer.h"
 
extern QPixmap loadIcon(QString nam);
extern ScribusApp* ScApp;
107,21 → 108,13
if ((pa < static_cast<int>(editor->StyledText.count())) && (editor->StyledText.count() != 0))
{
if (editor->StyledText.at(pa)->count() > 0)
{
st = editor->StyledText.at(pa)->at(0)->cab;
if (st < 5)
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, tr("No Style"));
else
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, editor->doc->docParagraphStyles[st].Vname);
}
else
{
st = editor->ParagStyles[pa];
if (st < 5)
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, tr("No Style"));
else
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, editor->doc->docParagraphStyles[st].Vname);
}
if (st < 5)
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, tr("No Style"));
else
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, editor->doc->docParagraphStyles[st].Vname);
}
else
{
3112,7 → 3105,15
disconnect(Editor, SIGNAL(cursorPositionChanged(int, int)), this, SLOT(updateProps(int, int)));
disconnect(AlignTools, SIGNAL(newStyle(int)), this, SLOT(newAlign(int)));
disconnect(AlignTools, SIGNAL(NewAlign(int)), this, SLOT(newAlign(int)));
emit EditSt();
//emit EditSt();
StilFormate *dia = new StilFormate(this, currDoc);
connect(dia, SIGNAL(saveStyle(StilFormate *)), ScApp, SLOT(saveStyles(StilFormate *)));
if (dia->exec())
ScApp->saveStyles(dia);
disconnect(dia, SIGNAL(saveStyle(StilFormate *)), ScApp, SLOT(saveStyles(StilFormate *)));
delete dia;
AlignTools->Spal->setFormats(currDoc);
AlignTools->SetAlign(Editor->currentParaStyle);
connect(AlignTools, SIGNAL(newStyle(int)), this, SLOT(newAlign(int)));
/branches/Version13x/Scribus/scribus/editformats.h
38,7 → 38,7
 
public:
StilFormate( QWidget* parent, ScribusDoc *doc);
~StilFormate() {};
//~StilFormate() {};
 
QListBox* ListBox1;
QPushButton* LoadS;
/branches/Version13x/Scribus/scribus/scribus.cpp
506,10 → 506,9
 
connect(propertiesPalette, SIGNAL(DocChanged()), this, SLOT(slotDocCh()));
connect(propertiesPalette, SIGNAL(NewAbStyle(int)), this, SLOT(setNewAbStyle(int)));
connect(propertiesPalette, SIGNAL(BackHome()), this, SLOT(Aktiv()));
connect(propertiesPalette, SIGNAL(Stellung(int)), this, SLOT(setItemHoch(int)));
connect(propertiesPalette, SIGNAL(EditCL()), this, SLOT(ToggleFrameEdit()));
connect(propertiesPalette, SIGNAL(NewTF(QString)), this, SLOT(SetNewFont(QString)));
connect(propertiesPalette, SIGNAL(NewTF(const QString&)), this, SLOT(SetNewFont(const QString&)));
connect(propertiesPalette, SIGNAL(UpdtGui(int)), this, SLOT(HaveNewSel(int)));
connect(propertiesPalette->Cpal, SIGNAL(NewPen(QString)), this, SLOT(setPenFarbe(QString)));
connect(propertiesPalette->Cpal, SIGNAL(NewBrush(QString)), this, SLOT(setBrushFarbe(QString)));
6177,7 → 6176,7
actionManager->connectModeActions();
}
 
void ScribusApp::Aktiv()
void ScribusApp::setMainWindowActive()
{
setActiveWindow();
raise();
6257,7 → 6256,7
{
if (view->SelItem.count() != 0)
{
setActiveWindow();
//setActiveWindow();
doc->CurrentStyle = h;
setStilvalue(doc->CurrentStyle);
view->chTyStyle(h);
6575,16 → 6574,15
connect(FontMenu, SIGNAL(activated(int)), this, SLOT(setItemFont(int)));
}
 
void ScribusApp::SetNewFont(QString nf)
void ScribusApp::SetNewFont(const QString& nf)
{
Aktiv();
int a;
QString nf2 = nf;
setMainWindowActive();
QString nf2(nf);
if (!doc->UsedFonts.contains(nf))
{
if (doc->AddFont(nf, prefsManager->appPrefs.AvailFonts[nf]->Font))
{
a = FontMenu->insertItem(new FmItem(nf, prefsManager->appPrefs.AvailFonts[nf]->Font));
int a = FontMenu->insertItem(new FmItem(nf, prefsManager->appPrefs.AvailFonts[nf]->Font));
FontID.insert(a, prefsManager->appPrefs.AvailFonts[nf]->SCName);
}
else
/branches/Version13x/Scribus/scribus/scribus.h
398,7 → 398,7
void setItemFont2(int id);
/** Korrigiert das FontMenu */
void AdjustFontMenu(QString nf);
void SetNewFont(QString nf);
void SetNewFont(const QString& nf);
/** Setz die Zeichensatzgroesse */
void setItemFSize(int id);
void setFSizeMenu(int size);
443,7 → 443,7
void reallySaveAsEps();
void SaveAsPDF();
void doSaveAsPDF();
void Aktiv();
void setMainWindowActive();
void setItemHoch(int h);
void setStilvalue(int s);
void setItemTypeStyle(int id);