Merge branch 'master' of github.com:Sankore/Sankore-3.1

preferencesAboutTextFull
shibakaneki 14 years ago
commit 96fcbc9dd9
  1. 8
      Sankore_3.1.pro
  2. 7
      resources/forms/mainWindow.ui
  3. BIN
      resources/images/paletteLibrary.png
  4. BIN
      resources/images/paletteNavigator.png
  5. BIN
      resources/images/toolbar/paraschool.png
  6. BIN
      resources/images/toolbar/record.png
  7. 11
      resources/sankore.qrc
  8. 4
      src/gui/UBDockPalette.cpp

@ -137,10 +137,10 @@ macx {
VERSION_RC_PATH = "$$BUILD_DIR/version_rc"
# Embed version into executable for breakpad
QMAKE_LFLAGS += -sectcreate \
__DATA \
__version \
$$VERSION_RC_PATH
# QMAKE_LFLAGS += -sectcreate \
# __DATA \
# __version \
# $$VERSION_RC_PATH
QMAKE_CXXFLAGS_RELEASE += -gdwarf-2 \
-mdynamic-no-pic

@ -1078,8 +1078,7 @@
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<normaloff>:/images/toolPalette/podcast.svg</normaloff>
<normalon>:/images/toolPalette/podcastOn.svg</normalon>:/images/toolPalette/podcast.svg</iconset>
<normaloff>:/images/toolbar/record.png</normaloff>:/images/toolbar/record.png</iconset>
</property>
<property name="text">
<string>Podcast</string>
@ -1640,6 +1639,10 @@
</property>
</action>
<action name="actionHideApplication">
<property name="icon">
<iconset resource="../sankore.qrc">
<normaloff>:/images/toolbar/hide.png</normaloff>:/images/toolbar/hide.png</iconset>
</property>
<property name="text">
<string>Hide Sankoré</string>
</property>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

@ -45,7 +45,6 @@
<file>images/reload.svg</file>
<file>images/frozen.svg</file>
<file>images/unfrozen.svg</file>
<file>images/toolbar/display.png</file>
<file>images/toolbar/window.png</file>
<file>images/toolbar/plusBlack.png</file>
<file>images/toolbar/plusBlackOn.png</file>
@ -107,7 +106,6 @@
<file>images/toolbar/captureWindow.png</file>
<file>images/toolbar/extraTool.png</file>
<file>images/toolbar/webUpload.png</file>
<file>images/toolbar/record.png</file>
<file>images/toolbar/stop.png</file>
<file>images/toolbar/pause.png</file>
<file>images/toolbar/cut.png</file>
@ -121,7 +119,6 @@
<file>images/toolbar/eraserTool.png</file>
<file>images/toolbar/lineTool.png</file>
<file>images/toolbar/tools.png</file>
<file>images/toolbar/paraschool.png</file>
<file>images/stylusPalette/arrow.png</file>
<file>images/stylusPalette/arrowOn.png</file>
<file>images/stylusPalette/eraser.png</file>
@ -259,8 +256,6 @@
<file>images/libpalette/notFound.png</file>
<file>images/libpalette/trash_favorite.svg</file>
<file>images/libpalette/back.png</file>
<file>images/paletteLibrary.png</file>
<file>images/paletteNavigator.png</file>
<file>images/stylusPalette/eraserArrow.png</file>
<file>images/stylusPalette/eraserOnArrow.png</file>
<file>images/stylusPalette/markerArrow.png</file>
@ -284,5 +279,11 @@
<file>images/libpalette/miniFavorite.png</file>
<file>images/libpalette/home.png</file>
<file>images/toolbar/updates.png</file>
<file>images/paletteLibrary.png</file>
<file>images/paletteNavigator.png</file>
<file>images/toolbar/paraschool.png</file>
<file>images/toolbar/display.png</file>
<file>images/toolbar/hide.png</file>
<file>images/toolbar/record.png</file>
</qresource>
</RCC>

@ -277,7 +277,7 @@ void UBDockPalette::paintEvent(QPaintEvent *event)
path.addRect(0.0, 0.0, width()-border(), height());
path.addRoundedRect(width()-2*border(), border(), 2*border(), TABSIZE, radius(), radius());
painter.drawPath(path);
painter.drawPixmap(width() - border(), border() + (TABSIZE / 2) - 6, 12, 12, mIcon);
painter.drawPixmap(width() - border() + 1, border() + 1 , border() - 4, TABSIZE - 2, mIcon);
}
else if(mOrientation == eUBDockOrientation_Right)
{
@ -286,7 +286,7 @@ void UBDockPalette::paintEvent(QPaintEvent *event)
path.addRect(border(), 0.0, width()-border(), height());
path.addRoundedRect(0.0, border(), 2*border(), TABSIZE, radius(), radius());
painter.drawPath(path);
painter.drawPixmap(2, border() + (TABSIZE / 2) - 6, 12, 12, mIcon);
painter.drawPixmap(2, border() + 1, border() - 3, TABSIZE - 2, mIcon);
}
else
{

Loading…
Cancel
Save