From e99a2eed3c79944a73f69276c31bd9ffd558e6bc Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Mon, 4 Jul 2011 18:20:12 +0300 Subject: [PATCH 1/2] Graphics Triangle Tool --- Sankore 3.1.iss | 89 ------------------ resources/images/toolPalette/triangleTool.png | Bin 11360 -> 9618 bytes src/tools/UBGraphicsTriangle.cpp | 71 ++++++++------ src/tools/UBGraphicsTriangle.h | 4 +- 4 files changed, 42 insertions(+), 122 deletions(-) delete mode 100644 Sankore 3.1.iss diff --git a/Sankore 3.1.iss b/Sankore 3.1.iss deleted file mode 100644 index 158894c7..00000000 --- a/Sankore 3.1.iss +++ /dev/null @@ -1,89 +0,0 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{E63D17F8-D9DA-479D-B9B5-0D101A03703B} -AppName=Sankore 3.1 -AppVerName=Sankore 3.1 -AppPublisher=Mnemis - -AppPublisherURL=http://www.getuniboard.com -AppSupportURL=http://support.getuniboard.com -AppUpdatesURL=http://www.getuniboard.com - -DefaultDirName={pf}\Sankore 3.1 -DefaultGroupName=Sankore 3.1 - -OutputDir=.\install\win32\ -OutputBaseFilename=Sankore 3.1 setup -SetupIconFile=.\resources\win\uniboard.ico -Compression=lzma -SolidCompression=yes - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked -Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[InstallDelete] - -Type: files ; Name: "{app}\Sankore 3.1.pdb" -Type: filesandordirs ; Name: "{app}\library" -Type: filesandordirs ; Name: "{app}\Microsoft.VC90.CRT" -Type: filesandordirs ; Name: "{app}\plugins" -Type: filesandordirs ; Name: "{app}\i18n" -Type: files ; Name: "{app}\*.dll" - -[Files] -Source: ".\build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ".\runtime\windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; -Source: ".\resources\win\plugins\*"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -Name: "{group}\Sankore 3.1"; Filename: "{app}\Sankore 3.1.exe" -;Name: "{group}\{cm:ProgramOnTheWeb,Sankore 3.1}"; Filename: "http://www.getuniboard.com/" -Name: "{group}\{cm:UninstallProgram,Sankore 3.1}"; Filename: "{uninstallexe}" -Name: "{commondesktop}\Sankore 3.1"; Filename: "{app}\Sankore 3.1.exe"; Tasks: desktopicon -Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Sankore 3.1"; Filename: "{app}\Sankore 3.1.exe"; Tasks: quicklaunchicon -Name: "{group}\Printing Preferences"; Filename: "{app}\properties.exe"; WorkingDir: {app} - -[Registry] -Root: HKCR; Subkey: ".ubz"; ValueType: string; ValueName: ""; ValueData: "SankoreFile"; Flags: uninsdeletevalue -Root: HKCR; Subkey: "SankoreFile"; ValueType: string; ValueName: ""; ValueData: "Sankore 3.1 document"; Flags: uninsdeletekey -Root: HKCR; Subkey: "SankoreFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Sankore 3.1.exe,1" -Root: HKCR; Subkey: "SankoreFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\Sankore 3.1.exe"" ""%1""" - -Root: HKLM; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Sankore 3.1.exe"; Flags: uninsdeletevalue; Check: isProcessorNotX64 -Root: HKLM; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorNotX64 -Root: HKLM; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64 -Root: HKLM; Subkey: "SOFTWARE\Sankore 3.1\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64 - -Root: HKLM64; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Sankore 3.1.exe"; Flags: uninsdeletevalue; Check: isProcessorX64 -Root: HKLM64; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorX64 -Root: HKLM64; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64 -Root: HKLM64; Subkey: "SOFTWARE\Sankore 3.1\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64 - -[Run] -Filename: "{app}\Sankore 3.1.exe"; Description: "{cm:LaunchProgram,Sankore 3.1}"; Flags: nowait postinstall - -[UninstallDelete] -; cleanup and delete whole installation directory -Name: {app}; Type: filesandordirs - -[Code] -function isProcessorX64: Boolean; -begin - Result := (ProcessorArchitecture = paX64); -end; - -function isProcessorNotX64: Boolean; -begin - Result := not isProcessorX64; -end; - diff --git a/resources/images/toolPalette/triangleTool.png b/resources/images/toolPalette/triangleTool.png index 0421bcea69995c0cc0247009ea0855bee5d20920..a9c876cd34451fc7ec64e66fb1ed00f660df0acd 100644 GIT binary patch literal 9618 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 k->paangle = -this->angle; + rotateAroundCenter(t, rotationCenter()); + setTransform(t); + } } UBGraphicsScene* UBGraphicsTriangle::scene() const @@ -236,17 +240,19 @@ void UBGraphicsTriangle::paintGraduations(QPainter *painter) void UBGraphicsTriangle::rotateAroundCenter(qreal angle) { + qreal oldAngle = this->angle; this->angle = angle; QTransform transform; - rotateAroundCenter(transform); + rotateAroundCenter(transform, rotationCenter()); setTransform(transform, true); + this->angle = oldAngle + angle; // We have to store absolute value for FLIP case } -void UBGraphicsTriangle::rotateAroundCenter(QTransform& transform) +void UBGraphicsTriangle::rotateAroundCenter(QTransform& transform, QPointF center) { - transform.translate(rotationCenter().x(), rotationCenter().y()); + transform.translate(center.x(), center.y()); transform.rotate(angle); - transform.translate(- rotationCenter().x(), - rotationCenter().y()); + transform.translate(- center.x(), - center.y()); } @@ -388,11 +394,11 @@ void UBGraphicsTriangle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) } else { - setRect( + setRect(QRectF( rect().left() - delta.x(), rect().top(), rect().width() + delta.x(), - rect().height(), + rect().height()), mOrientation ); } @@ -400,15 +406,18 @@ void UBGraphicsTriangle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) if (mResizing2) { QPointF delta = event->pos() - event->lastPos(); - if (rect().height() + delta.y() < sMinHeight) + if (rect().height() - delta.y() < sMinHeight) delta.setY(sMinHeight - rect().height()); - qDebug() << delta; - setRect(QRect( + qDebug() << event->pos() << event->lastPos() << delta; + QRectF r( rect().left(), rect().top() + delta.y(), rect().width(), - rect().height() - delta.y()), - mOrientation); + rect().height() - delta.y()); + qDebug() << r; + setRect(r, mOrientation); + + } if (mRotating) { diff --git a/src/tools/UBGraphicsTriangle.h b/src/tools/UBGraphicsTriangle.h index 69e9f436..756a1fc6 100644 --- a/src/tools/UBGraphicsTriangle.h +++ b/src/tools/UBGraphicsTriangle.h @@ -94,7 +94,7 @@ class UBGraphicsTriangle : public UBAbstractDrawRuler, public QGraphicsPolygonIt QTransform calculateRotationTransform(); qreal angle; - void rotateAroundCenter(QTransform& transform); + void rotateAroundCenter(QTransform& transform, QPointF center); bool mResizing1; bool mResizing2; @@ -115,7 +115,7 @@ class UBGraphicsTriangle : public UBAbstractDrawRuler, public QGraphicsPolygonIt static const int d = 70; // width of triangle border static const int sArrowLength = 30; static const int sMinWidth = 200; - static const int sMinHeight = 150; + static const int sMinHeight = 200; }; #endif /* UBGRAPHICSTRIANGLE_H_ */ From 7d08495143441378997d7825fa159aa4394a8ff6 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Mon, 4 Jul 2011 18:25:59 +0300 Subject: [PATCH 2/2] Comp. errors in UBPreferencesControler - marked by ??? --- src/core/UBPreferencesController.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp index 2bf93f5b..6297f407 100644 --- a/src/core/UBPreferencesController.cpp +++ b/src/core/UBPreferencesController.cpp @@ -38,8 +38,8 @@ UBPreferencesController::UBPreferencesController(QWidget *parent) mPreferencesWindow = new QDialog(parent, Qt::Dialog); mPreferencesUI = new Ui::preferencesDialog(); // deleted in UBPreferencesController::destructor mPreferencesUI->setupUi(mPreferencesWindow); - connect(mPreferencesUI->Username_textBox, SIGNAL(editingFinished()), this, SLOT(onCommunityUsernameChanged())); - connect(mPreferencesUI->Password_textEdit, SIGNAL(editingFinished()), this, SLOT(onCommunityPasswordChanged())); + // ??? connect(mPreferencesUI->Username_textBox, SIGNAL(editingFinished()), this, SLOT(onCommunityUsernameChanged())); + // ??? connect(mPreferencesUI->Password_textEdit, SIGNAL(editingFinished()), this, SLOT(onCommunityPasswordChanged())); wire(); } @@ -162,8 +162,8 @@ void UBPreferencesController::init() mPreferencesUI->verticalChoice->setChecked(settings->appToolBarOrientationVertical->get().toBool()); mPreferencesUI->horizontalChoice->setChecked(!settings->appToolBarOrientationVertical->get().toBool()); - mPreferencesUI->Username_textBox->setText(settings->communityUsername()); - mPreferencesUI->Password_textEdit->setText(settings->communityPassword()); + // ??? mPreferencesUI->Username_textBox->setText(settings->communityUsername()); + // ??? mPreferencesUI->Password_textEdit->setText(settings->communityPassword()); // pen tab mPenProperties->fineSlider->setValue(settings->boardPenFineWidth->get().toDouble() * sSliderRatio); @@ -184,13 +184,13 @@ void UBPreferencesController::init() void UBPreferencesController::onCommunityUsernameChanged() { UBSettings* settings = UBSettings::settings(); - settings->setCommunityUsername(mPreferencesUI->Username_textBox->text()); + // ??? settings->setCommunityUsername(mPreferencesUI->Username_textBox->text()); } void UBPreferencesController::onCommunityPasswordChanged() { UBSettings* settings = UBSettings::settings(); - settings->setCommunityPassword(mPreferencesUI->Password_textEdit->text()); + // ??? settings->setCommunityPassword(mPreferencesUI->Password_textEdit->text()); } void UBPreferencesController::close()