Merge branch 'release-candidate' of github.com:Sankore/Sankore-3.1 into release-candidate

preferencesAboutTextFull
Claudio Valerio 12 years ago
commit e225cfea56
  1. 4
      Sankore 3.1.iss
  2. 7
      resources/etc/Uniboard.css
  3. 14
      resources/windows/xpdfrc
  4. 11
      src/adaptors/UBSvgSubsetAdaptor.cpp
  5. 10
      src/core/UBApplication.cpp
  6. 2
      src/core/UBApplication.h
  7. 9
      src/core/UBPreferencesController.cpp
  8. 5
      src/core/UBPreferencesController.h
  9. 1
      src/domain/UBGraphicsScene.cpp

@ -91,6 +91,10 @@ Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengined.dll"; DestDir:
Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenSankore\plugins\playlistformats"; Flags: ignoreversion Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenSankore\plugins\playlistformats"; Flags: ignoreversion
Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenSankore\plugins\playlistformats"; Flags: ignoreversion Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenSankore\plugins\playlistformats"; Flags: ignoreversion
;fonts for xpdf
Source: "resources\windows\xpdfrc"; DestDir: "{app}"; Flags: ignoreversion
Source: "resources\fonts\*"; DestDir: "{app}\fonts"; Flags: ignoreversion
[Icons] [Icons]
Name: "{group}\Open-Sankoré"; Filename: "{app}\Open-Sankore.exe" Name: "{group}\Open-Sankoré"; Filename: "{app}\Open-Sankore.exe"
Name: "{group}\{cm:UninstallProgram,Open-Sankoré}"; Filename: "{uninstallexe}" Name: "{group}\{cm:UninstallProgram,Open-Sankoré}"; Filename: "{uninstallexe}"

@ -1,8 +1,13 @@
* QWidget:enabled
{ {
color: #3F3F3F; color: #3F3F3F;
} }
QWidget:disabled
{
color: #AAAAAA;
}
QTextEdit, QTextEdit,
QLineEdit, QLineEdit,
QComboBox#DockPaletteWidgetComboBox QAbstractItemView QComboBox#DockPaletteWidgetComboBox QAbstractItemView

@ -0,0 +1,14 @@
fontFile Times-Roman fonts/n021003l.pfb
fontFile Times-Italic fonts/n021023l.pfb
fontFile Times-Bold fonts/n021004l.pfb
fontFile Times-BoldItalic fonts/n021024l.pfb
fontFile Helvetica fonts/n019003l.pfb
fontFile Helvetica-Oblique fonts/n019023l.pfb
fontFile Helvetica-Bold fonts/n019004l.pfb
fontFile Helvetica-BoldOblique fonts/n019024l.pfb
fontFile Courier fonts/n022003l.pfb
fontFile Courier-Oblique fonts/n022023l.pfb
fontFile Courier-Bold fonts/n022004l.pfb
fontFile Courier-BoldOblique fonts/n022024l.pfb
fontFile Symbol fonts/s050000l.pfb
fontFile ZapfDingbats fonts/d050000l.pfb

@ -1693,6 +1693,7 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::polygonItemToSvgPolygon(UBGraphicsPo
QString points = pointsToSvgPointsAttribute(polygon); QString points = pointsToSvgPointsAttribute(polygon);
mXmlWriter.writeAttribute("points", points); mXmlWriter.writeAttribute("points", points);
mXmlWriter.writeAttribute("transform",toSvgTransform(polygonItem->sceneMatrix()));
mXmlWriter.writeAttribute("fill", polygonItem->brush().color().name()); mXmlWriter.writeAttribute("fill", polygonItem->brush().color().name());
qreal alpha = polygonItem->brush().color().alphaF(); qreal alpha = polygonItem->brush().color().alphaF();
@ -1781,6 +1782,16 @@ UBGraphicsPolygonItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItemFromPol
polygonItem->setPolygon(polygon); polygonItem->setPolygon(polygon);
QStringRef svgTransform = mXmlReader.attributes().value("transform");
QMatrix itemMatrix;
if (!svgTransform.isNull())
{
itemMatrix = fromSvgTransform(svgTransform.toString());
polygonItem->setMatrix(itemMatrix);
}
QStringRef svgFill = mXmlReader.attributes().value("fill"); QStringRef svgFill = mXmlReader.attributes().value("fill");
QColor brushColor = pDefaultColor; QColor brushColor = pDefaultColor;

@ -55,6 +55,7 @@
#include "frameworks/UBCryptoUtils.h" #include "frameworks/UBCryptoUtils.h"
#include "tools/UBToolsManager.h" #include "tools/UBToolsManager.h"
#include "UBDisplayManager.h"
#include "core/memcheck.h" #include "core/memcheck.h"
QPointer<QUndoStack> UBApplication::undoStack; QPointer<QUndoStack> UBApplication::undoStack;
@ -378,9 +379,18 @@ int UBApplication::exec(const QString& pFileToImport)
else else
applicationController->showBoard(); applicationController->showBoard();
onScreenCountChanged(1);
connect(desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(onScreenCountChanged(int)));
return QApplication::exec(); return QApplication::exec();
} }
void UBApplication::onScreenCountChanged(int newCount)
{
Q_UNUSED(newCount);
UBDisplayManager displayManager;
mainWindow->actionMultiScreen->setEnabled(displayManager.numScreens() > 1);
}
void UBApplication::importUniboardFiles() void UBApplication::importUniboardFiles()
{ {
mUniboardSankoreTransition = new UniboardSankoreTransition(); mUniboardSankoreTransition = new UniboardSankoreTransition();

@ -117,6 +117,8 @@ class UBApplication : public QtSingleApplication
#endif #endif
void importUniboardFiles(); void importUniboardFiles();
void onScreenCountChanged(int newCount);
private: private:
void updateProtoActionsState(); void updateProtoActionsState();
void setupTranslators(QStringList args); void setupTranslators(QStringList args);

@ -64,9 +64,12 @@ UBPreferencesController::UBPreferencesController(QWidget *parent)
, mPenProperties(0) , mPenProperties(0)
, mMarkerProperties(0) , mMarkerProperties(0)
{ {
mDesktop = qApp->desktop();
mPreferencesWindow = new UBPreferencesDialog(this,parent, Qt::Dialog); mPreferencesWindow = new UBPreferencesDialog(this,parent, Qt::Dialog);
mPreferencesUI = new Ui::preferencesDialog(); // deleted in mPreferencesUI = new Ui::preferencesDialog(); // deleted in
mPreferencesUI->setupUi(mPreferencesWindow); mPreferencesUI->setupUi(mPreferencesWindow);
adjustScreens(1);
connect(mDesktop, SIGNAL(screenCountChanged(int)), this, SLOT(adjustScreens(int)));
wire(); wire();
} }
@ -83,6 +86,12 @@ UBPreferencesController::~UBPreferencesController()
delete mMarkerProperties; delete mMarkerProperties;
} }
void UBPreferencesController::adjustScreens(int screen)
{
Q_UNUSED(screen);
UBDisplayManager displayManager;
mPreferencesUI->multiDisplayGroupBox->setEnabled(displayManager.numScreens() > 1);
}
void UBPreferencesController::show() void UBPreferencesController::show()
{ {

@ -85,12 +85,15 @@ class UBPreferencesController : public QObject
void onCommunityPasswordChanged(); void onCommunityPasswordChanged();
void onCommunityPersistenceChanged(); void onCommunityPersistenceChanged();
private: private slots:
void adjustScreens(int screen);
private:
static qreal sSliderRatio; static qreal sSliderRatio;
static qreal sMinPenWidth; static qreal sMinPenWidth;
static qreal sMaxPenWidth; static qreal sMaxPenWidth;
void persistanceCheckboxUpdate(); void persistanceCheckboxUpdate();
QDesktopWidget* mDesktop;
}; };

@ -287,6 +287,7 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent, bool enableUndoRedoSta
mShouldUseOMP = QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5; mShouldUseOMP = QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5;
#endif #endif
setUuid(QUuid::createUuid());
setDocument(parent); setDocument(parent);
createEraiser(); createEraiser();
createPointer(); createPointer();

Loading…
Cancel
Save