Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
9db8c85f
Kaydet (Commit)
9db8c85f
authored
Ock 19, 2017
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sfx2: load BitmapEx resources instead of Image ones
Change-Id: I9c5a0f1b23eadf15fee3ff78e5061474214fcc35
üst
aa347e36
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
33 additions
and
42 deletions
+33
-42
doc.hrc
sfx2/inc/doc.hrc
+2
-2
recentdocsview.cxx
sfx2/source/control/recentdocsview.cxx
+1
-1
recentdocsviewitem.cxx
sfx2/source/control/recentdocsviewitem.cxx
+2
-2
templateview.hrc
sfx2/source/control/templateview.hrc
+4
-4
templateview.src
sfx2/source/control/templateview.src
+5
-5
templateviewitem.cxx
sfx2/source/control/templateviewitem.cxx
+1
-1
dialog.hrc
sfx2/source/dialog/dialog.hrc
+1
-1
dialog.src
sfx2/source/dialog/dialog.src
+2
-5
dinfdlg.cxx
sfx2/source/dialog/dinfdlg.cxx
+1
-1
dinfdlg.src
sfx2/source/dialog/dinfdlg.src
+2
-2
titledockwin.cxx
sfx2/source/dialog/titledockwin.cxx
+2
-2
titledockwin.src
sfx2/source/dialog/titledockwin.src
+2
-2
doc.src
sfx2/source/doc/doc.src
+4
-10
templatedlg.cxx
sfx2/source/doc/templatedlg.cxx
+2
-2
sfxlocal.hrc
sfx2/source/inc/sfxlocal.hrc
+2
-2
No files found.
sfx2/inc/doc.hrc
Dosyayı görüntüle @
9db8c85f
...
...
@@ -104,8 +104,8 @@
#define STR_QMSG_SEL_FOLDER_DELETE (RID_SFX_DOC_START+146)
#define STR_QMSG_TEMPLATE_OVERWRITE (RID_SFX_DOC_START+147)
#define STR_QMSG_SEL_TEMPLATE_DELETE (RID_SFX_DOC_START+148)
#define
IMG
_ACTION_SORT (RID_SFX_DOC_START+149)
#define
IMG
_ACTION_REFRESH (RID_SFX_DOC_START+150)
#define
BMP
_ACTION_SORT (RID_SFX_DOC_START+149)
#define
BMP
_ACTION_REFRESH (RID_SFX_DOC_START+150)
#define STR_OPEN (RID_SFX_DOC_START+151)
#define STR_EDIT_TEMPLATE (RID_SFX_DOC_START+152)
...
...
sfx2/source/control/recentdocsview.cxx
Dosyayı görüntüle @
9db8c85f
...
...
@@ -62,7 +62,7 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent )
,
mnItemPadding
(
5
)
,
mnItemMaxTextLength
(
30
)
,
mnLastMouseDownItem
(
THUMBNAILVIEW_ITEM_NOTFOUND
)
,
maWelcomeImage
(
SfxResId
(
IMG_WELCOME
))
,
maWelcomeImage
(
BitmapEx
(
SfxResId
(
BMP_WELCOME
)
))
,
maWelcomeLine1
(
SfxResId
(
STR_WELCOME_LINE1
))
,
maWelcomeLine2
(
SfxResId
(
STR_WELCOME_LINE2
))
{
...
...
sfx2/source/control/recentdocsviewitem.cxx
Dosyayı görüntüle @
9db8c85f
...
...
@@ -36,8 +36,8 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, const OUString &rUR
:
ThumbnailViewItem
(
rView
,
nId
),
maURL
(
rURL
),
m_bRemoveIconHighlighted
(
false
),
m_aRemoveRecentBitmap
(
SfxResId
(
IMG
_RECENTDOC_REMOVE
)),
m_aRemoveRecentBitmapHighlighted
(
SfxResId
(
IMG
_RECENTDOC_REMOVE_HIGHLIGHTED
))
m_aRemoveRecentBitmap
(
SfxResId
(
BMP
_RECENTDOC_REMOVE
)),
m_aRemoveRecentBitmapHighlighted
(
SfxResId
(
BMP
_RECENTDOC_REMOVE_HIGHLIGHTED
))
{
OUString
aTitle
(
rTitle
);
INetURLObject
aURLObj
(
rURL
);
...
...
sfx2/source/control/templateview.hrc
Dosyayı görüntüle @
9db8c85f
...
...
@@ -9,9 +9,9 @@
#define STR_WELCOME_LINE1 259
#define STR_WELCOME_LINE2 260
#define
IMG
_WELCOME 261
#define
IMG
_RECENTDOC_REMOVE 262
#define
IMG
_RECENTDOC_REMOVE_HIGHLIGHTED 263
#define
IMG
_DEFAULT 264
#define
BMP
_WELCOME 261
#define
BMP
_RECENTDOC_REMOVE 262
#define
BMP
_RECENTDOC_REMOVE_HIGHLIGHTED 263
#define
BMP
_DEFAULT 264
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sfx2/source/control/templateview.src
Dosyayı görüntüle @
9db8c85f
...
...
@@ -19,22 +19,22 @@ String STR_WELCOME_LINE2
Text [ en-US ] = "Drop a document here or pick an app from the left side to create one.";
};
Image IMG
_WELCOME
Bitmap BMP
_WELCOME
{
ImageBitmap = Bitmap { File = "logo.png" ; }
;
File = "logo.png"
;
};
Bitmap
IMG
_RECENTDOC_REMOVE
Bitmap
BMP
_RECENTDOC_REMOVE
{
File = "recentdoc_remove.png";
};
Bitmap
IMG
_RECENTDOC_REMOVE_HIGHLIGHTED
Bitmap
BMP
_RECENTDOC_REMOVE_HIGHLIGHTED
{
File = "recentdoc_remove_highlighted.png";
};
Bitmap
IMG
_DEFAULT
Bitmap
BMP
_DEFAULT
{
File = "templatestar.png";
};
...
...
sfx2/source/control/templateviewitem.cxx
Dosyayı görüntüle @
9db8c85f
...
...
@@ -34,7 +34,7 @@ TemplateViewItem::TemplateViewItem (ThumbnailView &rView, sal_uInt16 nId)
:
ThumbnailViewItem
(
rView
,
nId
),
mnRegionId
(
USHRT_MAX
),
mnDocId
(
USHRT_MAX
),
maDefaultBitmap
(
SfxResId
(
IMG
_DEFAULT
)),
maDefaultBitmap
(
SfxResId
(
BMP
_DEFAULT
)),
mbIsDefaultTemplate
(
false
)
{
}
...
...
sfx2/source/dialog/dialog.hrc
Dosyayı görüntüle @
9db8c85f
...
...
@@ -56,7 +56,7 @@
#define STR_CANCEL_RECORDING ( RC_DIALOG_BEGIN + 108 )
#define STR_PDF_EXPORT_SEND ( RC_DIALOG_BEGIN + 120 )
#define
IMG
_INFO ( RC_DIALOG_BEGIN + 122 )
#define
BMP
_INFO ( RC_DIALOG_BEGIN + 122 )
//free
#define SFX_ST_EDIT ( RC_DIALOG_BEGIN + 124 )
#define STR_STYLE_ELEMTLIST ( RC_DIALOG_BEGIN + 125 )
...
...
sfx2/source/dialog/dialog.src
Dosyayı görüntüle @
9db8c85f
...
...
@@ -108,12 +108,9 @@ String STR_PDF_EXPORT_SEND
Text [ en-US ] = "Send" ;
};
Image IMG
_INFO
Bitmap BMP
_INFO
{
ImageBitmap = Bitmap
{
File = "info.png" ;
};
File = "info.png" ;
};
String STR_FONT_TABPAGE
...
...
sfx2/source/dialog/dinfdlg.cxx
Dosyayı görüntüle @
9db8c85f
...
...
@@ -1450,7 +1450,7 @@ CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) :
m_aTimeField
->
SetExtFormat
(
ExtTimeFieldFormat
::
Long24H
);
m_aDateField
->
SetExtDateFormat
(
ExtDateFieldFormat
::
SystemShortYYYY
);
m_aRemoveButton
->
SetModeImage
(
Image
(
SfxResId
(
SFX_IMG_PROPERTY_REMOVE
)));
m_aRemoveButton
->
SetModeImage
(
Image
(
BitmapEx
(
SfxResId
(
SFX_BMP_PROPERTY_REMOVE
)
)));
m_aRemoveButton
->
SetQuickHelpText
(
SfxResId
(
STR_SFX_REMOVE_PROPERTY
).
toString
());
m_aEditButton
->
SetText
(
SfxResId
(
SFX_ST_EDIT
).
toString
());
...
...
sfx2/source/dialog/dinfdlg.src
Dosyayı görüntüle @
9db8c85f
...
...
@@ -93,9 +93,9 @@ String STR_SFX_REMOVE_PROPERTY
Text [ en-US ] = "Remove Property" ;
};
Image SFX_IMG
_PROPERTY_REMOVE
Bitmap SFX_BMP
_PROPERTY_REMOVE
{
ImageBitmap = Bitmap { File = "deleterow.bmp" ; }
;
File = "deleterow.bmp"
;
};
String STR_SFX_QUERY_WRONG_TYPE
...
...
sfx2/source/dialog/titledockwin.cxx
Dosyayı görüntüle @
9db8c85f
...
...
@@ -214,8 +214,8 @@ namespace sfx2
m_aToolbox
->
Clear
();
// Get the closer bitmap and set it as right most button.
Image
aImage
(
SfxResId
(
SFX_IMG_CLOSE_DOC
)
);
m_aToolbox
->
InsertItem
(
1
,
aImage
);
BitmapEx
aBitmapEx
(
SfxResId
(
SFX_BMP_CLOSE_DOC
)
);
m_aToolbox
->
InsertItem
(
1
,
Image
(
aBitmapEx
)
);
m_aToolbox
->
ShowItem
(
1
);
}
...
...
sfx2/source/dialog/titledockwin.src
Dosyayı görüntüle @
9db8c85f
...
...
@@ -20,9 +20,9 @@
#include <sfx2/sfx.hrc>
#include "sfxlocal.hrc"
Image SFX_IMG
_CLOSE_DOC
Bitmap SFX_BMP
_CLOSE_DOC
{
ImageBitmap = Bitmap { File = "closedoc.png" ; }
;
File = "closedoc.png"
;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sfx2/source/doc/doc.src
Dosyayı görüntüle @
9db8c85f
...
...
@@ -368,20 +368,14 @@ String STR_QMSG_ERROR_OPENING_FILE_CONTINUE
Text [ en-US ] = "\nProceeding with import may cause data loss or corruption, and application may become unstable or crash.\n\nDo you want to ignore the error and attempt to continue loading the file?";
};
Image IMG
_ACTION_SORT
Bitmap BMP
_ACTION_SORT
{
ImageBitmap = Bitmap
{
File = "sortascending.png";
};
File = "sortascending.png";
};
Image IMG
_ACTION_REFRESH
Bitmap BMP
_ACTION_REFRESH
{
ImageBitmap = Bitmap
{
File = "reload.png";
};
File = "reload.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sfx2/source/doc/templatedlg.cxx
Dosyayı görüntüle @
9db8c85f
...
...
@@ -172,7 +172,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
mpActionMenu
=
VclPtr
<
PopupMenu
>::
Create
();
mpActionMenu
->
InsertItem
(
MNI_ACTION_NEW_FOLDER
,
SfxResId
(
STR_CATEGORY_NEW
).
toString
(),
Image
(
SfxResId
(
IMG_ACTION_REFRESH
)));
Image
(
BitmapEx
(
SfxResId
(
BMP_ACTION_REFRESH
)
)));
mpActionMenu
->
InsertItem
(
MNI_ACTION_RENAME_FOLDER
,
SfxResId
(
STR_CATEGORY_RENAME
).
toString
());
mpActionMenu
->
InsertItem
(
MNI_ACTION_DELETE_FOLDER
,
...
...
@@ -180,7 +180,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
mpActionMenu
->
InsertSeparator
();
mpActionMenu
->
InsertItem
(
MNI_ACTION_REFRESH
,
SfxResId
(
STR_ACTION_REFRESH
).
toString
(),
Image
(
SfxResId
(
IMG_ACTION_REFRESH
)));
Image
(
BitmapEx
(
SfxResId
(
BMP_ACTION_REFRESH
)
)));
mpActionMenu
->
InsertItem
(
MNI_ACTION_DEFAULT
,
SfxResId
(
STR_ACTION_DEFAULT
).
toString
());
mpActionMenu
->
SetSelectHdl
(
LINK
(
this
,
SfxTemplateManagerDlg
,
MenuSelectHdl
));
...
...
sfx2/source/inc/sfxlocal.hrc
Dosyayı görüntüle @
9db8c85f
...
...
@@ -40,8 +40,8 @@
#define SFX_CB_PROPERTY_STRINGARRAY (RID_SFX_SFXLOCAL_START + 13)
// Images ----------------------------------------------------------------
#define SFX_
IMG
_PROPERTY_REMOVE (RID_SFX_SFXLOCAL_START + 0)
#define SFX_
IMG
_CLOSE_DOC (RID_SFX_SFXLOCAL_START + 2)
#define SFX_
BMP
_PROPERTY_REMOVE (RID_SFX_SFXLOCAL_START + 0)
#define SFX_
BMP
_CLOSE_DOC (RID_SFX_SFXLOCAL_START + 2)
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment