new logo graphics

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24148 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/launcher/launcher.nsi b/development/Win32/launcher/launcher.nsi
index d6e3a3cd549baeedfa662c3c765ecc9f4d4ea60c..c7f5f8a4e12a4d4d550fc6b4cd31040ea46f03cf 100644 (file)
--- a/development/Win32/launcher/launcher.nsi
+++ b/development/Win32/launcher/launcher.nsi
@@ -46,7 +46,7 @@ Var ResultSubText
 #--------------------------------
 #User interface for debug output
 
-!define MUI_ICON "..\packaging\icons\lyx_32x32.ico"
+!define MUI_ICON "..\packaging\icons\lyx.ico"
 !define MUI_CUSTOMFUNCTION_GUIINIT InitInterface
 
 !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT $ResultText

diff --git a/development/Win32/packaging/icons/lyx.ico b/development/Win32/packaging/icons/lyx.ico
new file mode 100644 (file)
index 0000000..81d9204
Binary files /dev/null and b/development/Win32/packaging/icons/lyx.ico differ

diff --git a/development/Win32/packaging/installer/graphics/header.bmp b/development/Win32/packaging/installer/graphics/header.bmp
index 262387e9443f50ca2911f1141405dc6a2702241d..0c118e56901ba525ff635deb088134318a3fd2fb 100644 (file)
Binary files a/development/Win32/packaging/installer/graphics/header.bmp and b/development/Win32/packaging/installer/graphics/header.bmp differ

diff --git a/development/Win32/packaging/installer/graphics/wizard.bmp b/development/Win32/packaging/installer/graphics/wizard.bmp
index 0de0f5ce323b73cfb3d8ab40ea9828d6f7ece15d..665995f21ab0a4d048b5a2d30e728a0d3c7883b7 100644 (file)
Binary files a/development/Win32/packaging/installer/graphics/wizard.bmp and b/development/Win32/packaging/installer/graphics/wizard.bmp differ

diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh
index 07184ff640becc754086975498042528c0aa0f9c..6b36a77a9d89682e452a552e788d3403a3f78202 100644 (file)
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -14,13 +14,6 @@ Lists of files to include in the installer
 
 !macroend
 
-!macro FileListLyXIcons COMMAND DIRECTORY
-
-  ${FILE}lyx_32x32.ico"
-  ${FILE}lyx_doc_32x32.ico"
-
-!macroend
-
 !macro FileListLyXScriptsCleanDVI COMMAND DIRECTORY
 
   ${FILE}clean_dvi.py"

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index a9fa114986e190bd0bc330739545b4af904e515e..a2cd58f77eac300e44936c41bea27cef73bd2a9d 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -141,7 +141,7 @@ SetCompressor /SOLID lzma
 !endif\r
 \r
 !define SETUP_DEFAULT_DIRECTORY "$PROGRAMFILES\${APP_NAME}${APP_SERIES_KEY}"\r
-!define SETUP_ICON "${FILES_ICONS}\lyx_32x32.ico"\r
+!define SETUP_ICON "${FILES_ICONS}\lyx.ico"\r
 !define SETUP_HEADERIMAGE "graphics\header.bmp"\r
 !define SETUP_WIZARDIMAGE "graphics\wizard.bmp"\r
 !define SETUP_UNINSTALLER "Uninstall-${APP_NAME}.exe"\r

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 3ca1dc99b2b49be83d4ab4a8dfb0b83348a74af7..dfa21f78de3740a41d1af5a3ae822d55a508c07b 100644 (file)
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -22,7 +22,7 @@ Section -FileAssociations
   !define REG_FILETYPE 'WriteRegStr SHELL_CONTEXT "Software\Classes\${APP_REGNAME_DOC}'
   
   ${REG_FILETYPE}" "" "${APP_NAME} Document"
-  ${REG_FILETYPE}\DefaultIcon" "" "$INSTDIR\bin\lyx_doc_32x32.ico"
+  ${REG_FILETYPE}\DefaultIcon" "" "$INSTDIR\bin\lyx.exe,0"
   ${REG_FILETYPE}\Shell\open\command" "" '"$INSTDIR\${APP_RUN}" "%1"'
   
   !define REG_FILEEXT 'WriteRegStr SHELL_CONTEXT "Software\Classes\${APP_EXT}"'
@@ -64,7 +64,7 @@ Section -InstallData
   
   ${REG_UNINSTALL} "UninstallString" '"$INSTDIR\${SETUP_UNINSTALLER}"'
   ${REG_UNINSTALL} "DisplayVersion" "${APP_VERSION}"
-  ${REG_UNINSTALL} "DisplayIcon" "$INSTDIR\bin\lyx_32x32.ico"
+  ${REG_UNINSTALL} "DisplayIcon" "$INSTDIR\bin\lyx.exe,0"
   ${REG_UNINSTALL} "URLUpdateInfo" "http://www.lyx.org/"
   ${REG_UNINSTALL} "URLInfoAbout" "http://www.lyx.org/about/"
   ${REG_UNINSTALL} "Publisher" "LyX Team"

diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index e540dbd41d052f43e364d6a1d67ce97af6e45a0a..a4a0f0d316743384b4ab764e379df997049634e3 100644 (file)
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -38,12 +38,7 @@ Section -ProgramFiles SecProgramFiles
   !insertmacro FileListDvipostBin File "${FILES_DVIPOST}\"
   !insertmacro FileListPDFViewBin File "${FILES_PDFVIEW}\"
   !insertmacro FileListPDFToolsBin File "${FILES_PDFTOOLS}\"
-
-  # Icons
   
-  SetOutPath "$INSTDIR\bin"
-  !insertmacro FileListLyXIcons File "${FILES_ICONS}\"
-
   # Resources
   
   SetOutPath "$INSTDIR"

diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh
index 1e903de54a4436dfb34cd7280c0ecec1473e7f23..27ceb5e9321b4a571d484a82b862b301c1243607 100644 (file)
--- a/development/Win32/packaging/installer/setup/uninstall.nsh
+++ b/development/Win32/packaging/installer/setup/uninstall.nsh
@@ -26,10 +26,6 @@ Section "un.Program Files" un.SecProgramFiles
   !insertmacro FileListPDFToolsBin Delete "$INSTDIR\bin\"
   !insertmacro FileListPDFViewBin Delete "$INSTDIR\bin\"
   
-  # Icons
-  
-  !insertmacro FileListLyXIcons Delete "$INSTDIR\bin\"  
-  
   # Resources
   
   RMDir /r "$INSTDIR\Resources"

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index e9b77d775603685bcb92aad195839a50d4fd033f..4f20a17953f885fc825d80f71c3c900e6fa49382 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1606,7 +1606,7 @@ if env['HAVE_FCNTL']:
         LIBS = ['support'] + intl_libs + system_libs +
             socket_libs + boost_libraries + qtcore_lib,
         source = ['$BUILDDIR/src/client/%s' % x for x in src_client_files] + \
-            utils.createResFromIcon(frontend_env, 'lyx_32x32.ico', '$LOCALLIBPATH/client.rc')
+            utils.createResFromIcon(frontend_env, 'lyx.ico', '$LOCALLIBPATH/client.rc')
     )
     Alias('client', frontend_env.Command(os.path.join('$BUILDDIR', os.path.split(str(client[0]))[1]),
         client, [Copy('$TARGET', '$SOURCE')]))
@@ -1626,7 +1626,7 @@ tex2lyx = frontend_env.Program(
     target = '$BUILDDIR/src/tex2lyx/tex2lyx',
     LIBS = ['support'] + boost_libraries + intl_libs + system_libs + qtcore_lib,
     source = ['$BUILDDIR/src/tex2lyx/%s' % x for x in src_tex2lyx_files + src_tex2lyx_copied_files] + \
-        utils.createResFromIcon(frontend_env, 'lyx_32x32.ico', '$LOCALLIBPATH/tex2lyx.rc'),
+        utils.createResFromIcon(frontend_env, 'lyx.ico', '$LOCALLIBPATH/tex2lyx.rc'),
     CPPPATH = ['$BUILDDIR/src/tex2lyx', '$BUILDDIR/src', '$CPPPATH'],
     LIBPATH = ['#$LOCALLIBPATH', '$LIBPATH'],
     CCFLAGS = ['$CCFLAGS', '-DTEX2LYX'],
@@ -1666,7 +1666,7 @@ Alias('lyxbase', lyxbase_post)
 lyx = frontend_env.Program(
     target = '$BUILDDIR/lyx',
     source = ['$BUILDDIR/src/main.cpp'] + \
-        utils.createResFromIcon(frontend_env, 'lyx_32x32.ico', '$LOCALLIBPATH/lyx.rc'),
+        utils.createResFromIcon(frontend_env, 'lyx.ico', '$LOCALLIBPATH/lyx.rc'),
     LIBS = [
         'lyxbase_pre',
         'mathed',

diff --git a/lib/images/banner.png b/lib/images/banner.png
index 7741c040d3fbadf32a85a1a9ec1e7dc57a63b3f0..0a31c8bfdb5ebb6a021e0e73e4b0a743ff702616 100644 (file)
Binary files a/lib/images/banner.png and b/lib/images/banner.png differ

diff --git a/lib/images/lyx.png b/lib/images/lyx.png
index 81774fc0ec705b852081fc577f4ac867e39d5e98..196c24ebd6e2c5af1e8526cfa0bd6754f2a7902b 100644 (file)
Binary files a/lib/images/lyx.png and b/lib/images/lyx.png differ

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 6578be571b863032e23cffc60799fd92120d6739..2a0bac0df389428f115de3ceee5ace60c5c63713 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -113,18 +113,18 @@ public:
        {
                LYXERR(Debug::GUI, "show banner: " << lyxrc.show_banner);
                /// The text to be written on top of the pixmap
-               QString const text = lyx_version ? lyx_version : qt_("unknown version");
+               QString const text = "version " + (lyx_version ? lyx_version : qt_("unknown version"));
                splash_ = QPixmap(":/images/banner.png");
 
                QPainter pain(&splash_);
-               pain.setPen(QColor(255, 255, 0));
+               pain.setPen(QColor(0, 0, 0));
                QFont font;
                // The font used to display the version info
                font.setStyleHint(QFont::SansSerif);
                font.setWeight(QFont::Bold);
                font.setPointSize(int(toqstr(lyxrc.font_sizes[FONT_SIZE_LARGE]).toDouble()));
                pain.setFont(font);
-               pain.drawText(260, 270, text);
+               pain.drawText(190, 225, text);
        }
 
        void paintEvent(QPaintEvent *)
@@ -300,8 +300,8 @@ GuiView::GuiView(int id)
        // We don't want to keep the window in memory if it is closed.
        setAttribute(Qt::WA_DeleteOnClose, true);
 
-#ifndef Q_WS_MACX
-       // assign an icon to main form. We do not do it under Qt/Mac,
+#ifndef Q_WS_WIN | Q_WS_MACX
+       // assign an icon to main form. We do not do it under Qt/Win or Qt/Mac,
        // since the icon is provided in the application bundle.
        setWindowIcon(QPixmap(":/images/lyx.png"));
 #endif