From 765db135125f3cda81d7de7d4fe949dc5ec894f4 Mon Sep 17 00:00:00 2001 From: cxl Date: Sat, 13 Sep 2008 18:22:49 +0000 Subject: [PATCH] Added icon for .sch files.. git-svn-id: svn://ultimatepp.org/upp/trunk@442 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Sql/srcdoc.tpp/index$en-us.tpp | 7 ++++--- uppsrc/ide/Common/ComDlg.cpp | 2 ++ uppsrc/ide/Common/common.iml | 18 ++++++++++++++++++ uppsrc/ide/UppDlg.h | 7 ++++++- uppsrc/ide/UppWspc.cpp | 8 ++++++++ uppsrc/ide/icon.ico | Bin 2862 -> 2862 bytes 6 files changed, 38 insertions(+), 4 deletions(-) diff --git a/uppsrc/Sql/srcdoc.tpp/index$en-us.tpp b/uppsrc/Sql/srcdoc.tpp/index$en-us.tpp index 4a9af73b3..e4398295c 100644 --- a/uppsrc/Sql/srcdoc.tpp/index$en-us.tpp +++ b/uppsrc/Sql/srcdoc.tpp/index$en-us.tpp @@ -1,4 +1,5 @@ -topic "U++ SQL Basics";[ $$0,0#00000000000000000000000000000000:Default] +topic "U++ SQL Basics"; +[ $$0,0#00000000000000000000000000000000:Default] [b83;*4 $$1,0#07864147445237544204411237157677:title] [b83;_R+117 $$2,0#50327538467692101372348457405326:heading1] [b50;a25;*R2 $$3,3#10189570498413014020290115411120:heading2] @@ -6,7 +7,7 @@ topic "U++ SQL Basics";[ $$0,0#00000000000000000000000000000000:Default] [{_}%EN-US [s1; U`+`+ SQL&] [s2; U`+`+ SQL Basics&] -[s3; Datbase Model&] +[s3; Database Model&] [s4; The database model is described by the user in schema (`".sch`") files. The user models the database and U`+`+ SQL packages handle the creation/modification of the database.&] @@ -36,7 +37,7 @@ are generated by the U`+`+ SQL classes, and you can view the generated queries with a simple method call.&] [s3; Schema Update/Upgrade&] [s4; The SQL packages also allow for database updates without losing -your stored data. The main purpose is to allow incemental development +your stored data. The main purpose is to allow incremental development of the model. This functionality is limited though, as it is implemented using `"ALTER`" sql commands and does not support removing columns or changing datatypes. Those functions have diff --git a/uppsrc/ide/Common/ComDlg.cpp b/uppsrc/ide/Common/ComDlg.cpp index 998726c95..0550aa197 100644 --- a/uppsrc/ide/Common/ComDlg.cpp +++ b/uppsrc/ide/Common/ComDlg.cpp @@ -23,6 +23,8 @@ void IdeFileIcon0(bool dir, const String& filename, Image& img, bool fast = fals img = fast ? IdeCommonImg::FastISource() : IdeCommonImg::ISource(); if(ext == ".c" || ext == ".cpp" || ext == ".cc" || ext == ".cxx") img = fast ? IdeCommonImg::FastSource() : IdeCommonImg::Source(); + if(ext == ".sch") + img = IdeCommonImg::Sch(); } Image IdeFileImage(const String& filename, bool fast) diff --git a/uppsrc/ide/Common/common.iml b/uppsrc/ide/Common/common.iml index 4775552fe..1eabef02d 100644 --- a/uppsrc/ide/Common/common.iml +++ b/uppsrc/ide/Common/common.iml @@ -1,3 +1,21 @@ +IMAGE_BEGIN(Sch) + IMAGE_SCAN("Ð") + IMAGE_SCAN("ć\0\0\0Å") + IMAGE_SCAN("‚\0\0\0‡È\377\34‚\0\0\0Ã") + IMAGE_SCAN("Á\1\0\0\0‹È\377\34\1\0\0\0Â") + IMAGE_SCAN("Áƒ\0\0\0‡È\377\34ƒ\0\0\0Â") + IMAGE_SCAN("Á\1\0\0\0‚È\377\34‡\0\0\0‚È\377\34\1\0\0\0Â") + IMAGE_SCAN("Á\1\0\0\0‹È\377\34\1\0\0\0Â") + IMAGE_SCAN("Áƒ\0\0\0‡È\377\34ƒ\0\0\0Â") + IMAGE_SCAN("Á\1\0\0\0‚È\377\34‡\0\0\0‚È\377\34\1\0\0\0Â") + IMAGE_SCAN("Á\1\0\0\0‹È\377\34\1\0\0\0Â") + IMAGE_SCAN("Áƒ\0\0\0‡È\377\34ƒ\0\0\0Â") + IMAGE_SCAN("Á\1\0\0\0‚È\377\34‡\0\0\0‚È\377\34\1\0\0\0Â") + IMAGE_SCAN("Á\1\0\0\0‹È\377\34\1\0\0\0Â") + IMAGE_SCAN("‚\0\0\0‡È\377\34‚\0\0\0Ã") + IMAGE_SCAN("ć\0\0\0Å") + IMAGE_SCAN("Ð") +IMAGE_PACKED(Sch, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0") IMAGE_BEGIN(Header) IMAGE_SCAN("Ð") IMAGE_SCAN("Ð") diff --git a/uppsrc/ide/UppDlg.h b/uppsrc/ide/UppDlg.h index f55f89d1f..222206dc4 100644 --- a/uppsrc/ide/UppDlg.h +++ b/uppsrc/ide/UppDlg.h @@ -109,11 +109,16 @@ struct DependsDlg : public WithUppOptPushDlg { DependsDlg(); }; +struct UppList : FileList { + virtual void Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, + dword style) const; +}; + struct WorkspaceWork { static Font ListFont(); FileList package; - FileList filelist; + UppList filelist; Vector fileindex; String main; diff --git a/uppsrc/ide/UppWspc.cpp b/uppsrc/ide/UppWspc.cpp index 95c07209b..4d177c082 100644 --- a/uppsrc/ide/UppWspc.cpp +++ b/uppsrc/ide/UppWspc.cpp @@ -754,3 +754,11 @@ void WorkspaceWork::SerializeClosed(Stream& s) s % list; closed = list; } + +void UppList::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const +{ + FileList::File file = ValueTo(q); + if(GetFileName(file.name) == "$.tpp" && IsFolder(file.name)) + file.name = GetFileName(GetFileFolder(file.name)) + " templates"; + FileList::Paint(w, r, RawToValue(file), ink, paper, style); +} diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico index ed674dab4681e8f6a8a54a9f03063eb6fa681734..66d6cad5343be778e84fe2251eed99f66c1dca1c 100644 GIT binary patch delta 407 zcmZ1{woYsV3+u#$NEi|q=3!=LK*rkI+7kms{Xs&=0Hy?448#VB1GS(F!;OThnHVT5 zk8UJPJJjfjfr`omlz>bHnxsyIGKf-9c92rAmrU6~&IB8f0rtJm}+hD ztc;v+z|PJFV>1H*Clfn6Cx`|D2%ia+&&tFElLzZ#Wo3ft=i~sI&jQ3S^TB);1b=fU H=Tb%h-RvDW literal 2862 zcmcguy^hmB5FVe6&r5ZbRGhBi%1A*-bS~fpkW!{XLOcPqktm=;5ONncJc|n&dL9SK z%r~>MyIv(Ax_gv?&&u`C@p-JWu9xe$V{Dvm1|32wvRx2)vN^dYuEXibpQYChc7JzGs~k&O>eF zh;ivrj znzMnq@~@I5GgoKHByJ@fk-2k@3l=3x}0T#}c*!0~^0%p>-E z==`)U?roltBjzN=Zjj0R{pirX?}J}6|7`;*Zcc*Nr%%t*IbyFqa>;Dt$+{cOibLU> z7#^`i6}5MD$4On5p|C6pSJ$OuBhs|3Th_H}y^r8>S!>d{lEuxIOKcERe>V2p+062S zYulOO9r!C&;}^e5{HAebRk1F-*I2iU?+etkeI@qu`sMZoGV5npGr8-W F{sOt@+Oq%v