Skip to content

B
branding-etersoft-ximper
Commit 82f16472 authored by Anton V. Boyarshinov's avatar Anton V. Boyarshinov
Browse files
Options

Merge branch 'alt-desktop' into altlinux-office-server

Conflicts: branding.spec
parents 2952b628 337f3099
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 327 deletions
Makefile.in
View file @ 82f16472
......@@ -14,6 +14,9 @@ all:
convert images/background.png -gravity northeast -pointsize 30 -annotate 0 '@STATUS@' background.png
cp -al background.png graphics/backgrounds/default.png
cp -al background.png graphics/backgrounds/xdm.png
convert -resize '800x600!' background.png browser-qt/design/bg.png
convert -resize '800x600!' background.png alterator/design/bg.png
# console background
cp -al images/console.jpg bootsplash/images/bootsplash-800x600.jpg
convert -resize '640x480!' bootsplash/images/bootsplash-800x600.jpg bootsplash/images/bootsplash-640x480.jpg
#color scheme
mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"
alterator/Makefile
View file @ 82f16472
install: install-ui
include /usr/share/alterator/build/ui2.mak
all:
rcc-qt4 -binary theme.qrc -o theme.rcc
alterator/design/styles/alterator.css deleted 100644 → 0
View file @ 2952b628
body {
background-color: #f2f2ec;
color: #333333;
margin: 0px;
padding: 10px;
font-family : Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 9pt;
}
a:link, a:active, a:visited {
color: #0074a7;
font-weight: bold;
text-decoration:underline;
}
a:hover {
color: #4295b9;
font-weight: bold;
text-decoration:underline;
}
table {
font-size: 9pt;
border-color: #023F6E;
border-collapse: collapse;
}
th {
padding: 0px 7px 3px 0px;
}
tr {
vertical-align: top;
}
hr {
border: none;
border-top: 1px solid #8d8d7e;
}
h1 {
text-align: center;
margin: 0px;
}
textarea, select, input.text {
border: 1px solid #023F6E;
font-size: 8pt;
margin: 1px 3px 1px 0px;
padding: 1px 3px;
}
.btn {
background-color: #e5e5d9;
color: #333333;
border: 1px solid #a5a58c;
cursor: pointer;
font-size: 9pt;
padding: 0px 3px;
}
.btn:hover {
background-color: #ffffff;
}
.error-message {
background-color: #FFCACA;
border: 1px solid #FF6060;
padding-left:10px;
padding-right:10px;
margin-bottom:10px;
}
.info-name {
font-size: 18pt;
border-bottom: 2px solid #023F6E;
}
.info-description {
font-size: 12pt;
font-weight: bold;
padding-top: 10px;
}
.frame-table {
border-style:solid;
border-width:1px;
margin: 3px;
}
.frame-table td, .frame-table th {
border-style:solid;
border-width:1px;
padding: 1px 1px 3px 3px;
}
.disabled {
color: #6e6e6e;
}
.alterator-progress {
border: 1px solid #023F6E;
height: 20px;
width: 200px;
padding: 2px;
background-color: #FFFFFF;
}
.alterator-progress div {
background-color: #023F6E;
height: 20px;
}
.year {
font-weight: bold;
}
.week {
border-style:solid;
border-width:1px;
background-color: white;
}
.today {
border-style:solid;
border-width:1px;
background-color: yellow;
cursor: pointer;
}
.day {
border-style:solid;
border-width:1px;
cursor: pointer;
}
.day:hover {
background-color: #e5e5d9;
}
.alterator-dateedit-calendar table {
width: 100%;
text-align: center;
border-style: solid;
border-width: 1px;
background-color:#cfd0c1;
}
.alterator-dateedit td {
padding: 3px;
}
.alterator-dateedit-button {
vertical-align:middle;
cursor:pointer;
background: url(/design/images/dateedit.png) no-repeat;
width: 15px;
height: 16px;
}
table.alterator-listbox {
border: solid 1px;
}
table.alterator-listbox th {
background-color: #91917a;
font-weight: bold;
border: solid 1px;
padding: 3px;
}
table.alterator-listbox td {
background: #ffffff;
border-left: solid 1px;
border-right: solid 1px;
padding: 3px;
}
alterator/design/styles/card-index.css deleted 100644 → 0
View file @ 2952b628
.selector-actions {
position: absolute;
right: 30px;
}
.selector-chooser {
width: 100%;
}
alterator/design/styles/menu.css deleted 100644 → 0
View file @ 2952b628
#logo-td {
border-left: none;
padding-left: 10px;
padding-right: 10px;
text-align:left;
width: 261px;
background: url(/design/images/line1.gif);
}
#logo-td img {
border-right: solid 1px white;
background: url(/design/images/logo.gif) no-repeat;
width: 261px;
height: 42px;
}
#help-td {
vertical-align:middle;
width:1px;
border-left: solid 1px white;
padding-left: 10px;
padding-right: 10px;
text-align:right;
background: url(/design/images/line1.gif);
}
#locale-td {
vertical-align:middle;
width:1px;
border-left: solid 1px white;
padding-left: 10px;
padding-right: 10px;
text-align:right;
background: url(/design/images/line1.gif);
}
#hostinfo-td {
vertical-align:middle;
padding-left: 10px;
padding-right: 10px;
text-align: left;
background: url(/design/images/line1.gif);
font-weight: bold;
font-size:large;
text-decoration: none;
color: #5b5b52;
}
.expanded {
width: 100%;
}
/* main menu */
#menu-td {
padding-right: 1px;
}
#main-td {
background-color: #dcddd1;
width: 100%;
background-image:url(/design/images/bg.jpg);
background-position:top left;
background-repeat:no-repeat;
}
#main {
padding: 10px 20px;
}
.menu-item-normal a {
font-weight: normal;
padding-left:10px;
padding-right:10px;
padding-top:3px;
padding-bottom:3px;
}
.menu-item-selected a {
font-weight: bold;
padding-left:10px;
padding-right:10px;
padding-top:3px;
padding-bottom:3px;
}
.menu-group-name {
background-color:#cfd0c1;
font-weight: bold;
padding-left:10px;
padding-right:10px;
padding-top:5px;
padding-bottom:5px;
}
.menu-group {
padding-bottom: 5px;
}
#help-popup {
background-color: #f2f2ec;
}
.hresizeable {
width: 100%;
height: 7px;
background:#cfd0c1 url(/design/images/hgrabber.gif) no-repeat scroll 45%;
cursor: s-resize;
}
.hresizeable:hover {
background-color: #e2e3d3;
}
branding.spec
View file @ 82f16472
......@@ -6,10 +6,8 @@
%define status alpha
Name: branding-%brand-%theme
Version: 5.0
Release: alt10
%define variants altlinux-office-desktop altlinux-office-server altlinux-lite
Version: 5.0.0
Release: alt2
BuildArch: noarch
BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
......@@ -59,21 +57,20 @@ Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "brandi
This package contains graphics for boot process
(needs console splash screen enabled)
%package browser-qt
Summary: Design for QT alterator for Desktop version
%package alterator
Summary: Design for alterator for %Brand %Theme
License: GPL
Group: System/Configuration/Other
Packager: Anton V. Boyarshiniv <boyarsh@altlinux.org>
Provides: design-alterator-browser-%theme branding-alt-%theme-browser-qt
Provides: design-alterator-browser-%theme branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
Provides: alterator-icons design-alterator-%theme
Obsoletes: branding-alt-%theme-browser-qt
Obsoletes: branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-browser-qt ";done )
Requires: alterator-browser-qt
PreReq(post,preun): alternatives >= 0.2
%description browser-qt
Design for QT alterator for Desktop version
%description alterator
Design for QT and web alterator for %Brand %Theme
%define provide_list altlinux fedora redhat system altlinux
......@@ -152,8 +149,8 @@ make
DEFAULT_LANG='--lang-to-subst--' PATH=$PATH:/usr/sbin %make
popd
#browser-qt
pushd browser-qt
#altarator
pushd alterator
%make_build
popd
......@@ -181,8 +178,8 @@ for i in 1; do \
done
popd
#browser-qt
pushd browser-qt
#alterator
pushd alterator
mkdir -p %buildroot/usr/share/alterator-browser-qt/design
install theme.rcc %buildroot/usr/share/alterator-browser-qt/design/%theme.rcc
......@@ -199,7 +196,7 @@ __EOF__
#release
install -pD -m644 /dev/null %buildroot%_sysconfdir/buildreqs/packages/ignore.d/%name-release
echo "%distribution %version %Theme (%codename)" >%buildroot%_sysconfdir/altlinux-release
echo "%distribution %version %Theme %status (%codename)" >%buildroot%_sysconfdir/altlinux-release
for n in fedora redhat system; do
ln -s altlinux-release %buildroot%_sysconfdir/$n-release
done
......@@ -261,7 +258,7 @@ echo $lang > lang
%__rm -f %_sysconfdir/bootsplash/themes/current
%files browser-qt
%files alterator
%config %_altdir/%name-browser-qt
/usr/share/alterator-browser-qt/design/%theme.rcc
/usr/share/alterator/design/images
......@@ -288,6 +285,13 @@ echo $lang > lang
%_desktopdir/*
%changelog
* Mon Mar 30 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt2
- -browser-qt subpackage remaned to -alterator as it really is
* Fri Mar 27 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt1
- addes \%status to altlinux-release
- images for verbose bootsplash mode from one source
* Wed Mar 25 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt10
- added versioned provides for indexhtml
- indexhtml subpackage added
......
browser-qt/Makefile deleted 100644 → 0
View file @ 2952b628
all:
rcc-qt4 -binary theme.qrc -o theme.rcc
configure.ac
View file @ 82f16472
......@@ -20,7 +20,7 @@ AC_CONFIG_FILES([
bootloader/config
bootsplash/config/bootsplash-640x480.cfg
bootsplash/config/bootsplash-800x600.cfg
browser-qt/design/design.ini
alterator/design/design.ini
bootloader/gfxboot.cfg
kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc
notes/release-notes.ru.html
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment