Merged fc0b7c9e9f9f and 5e4566f294fd
This commit is contained in:
DrSlony
commit
08bda863c9
BIN
rtdata/images/Dark/actions/trash-hide-deleted.png
Normal file
BIN
rtdata/images/Dark/actions/trash-hide-deleted.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 746 B |
BIN
rtdata/images/Light/actions/trash-hide-deleted.png
Normal file
BIN
rtdata/images/Light/actions/trash-hide-deleted.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 747 B |
@ -170,6 +170,7 @@ FILEBROWSER_SHOWDIRHINT;Clear all filters.\nShortcut: <b>d</b>
|
||||
FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>7</b>
|
||||
FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>6</b>
|
||||
FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode.
|
||||
FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
|
||||
FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>1</b>
|
||||
FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>2</b>
|
||||
FILEBROWSER_SHOWRANK3HINT;Show images ranked as 3-star.\nShortcut: <b>3</b>
|
||||
|
||||
@ -443,6 +443,9 @@ void FileBrowser::addEntry_ (FileBrowserEntry* entry) {
|
||||
initEntry (entry);
|
||||
}
|
||||
redraw ();
|
||||
|
||||
// newly added item might have been already trashed in a previous session
|
||||
trash_changed().emit();
|
||||
}
|
||||
|
||||
FileBrowserEntry* FileBrowser::delEntry (const Glib::ustring& fname) {
|
||||
|
||||
@ -272,13 +272,24 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
|
||||
iTrashEmpty = new RTImage("trash-show-empty.png") ;
|
||||
iTrashFull = new RTImage("trash-show-full.png") ;
|
||||
|
||||
bTrash = Gtk::manage( new Gtk::ToggleButton () );
|
||||
bTrash = Gtk::manage( new Gtk::ToggleButton () );
|
||||
bTrash->set_image (*iTrashEmpty);
|
||||
bTrash->set_relief (Gtk::RELIEF_NONE);
|
||||
bTrash->set_tooltip_markup (M("FILEBROWSER_SHOWTRASHHINT"));
|
||||
bCateg[17] = bTrash->signal_toggled().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::categoryButtonToggled), bTrash, true));
|
||||
bTrash->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event),false);
|
||||
|
||||
iNotTrash = new RTImage("trash-hide-deleted.png") ;
|
||||
|
||||
bNotTrash = Gtk::manage( new Gtk::ToggleButton () );
|
||||
bNotTrash->set_image (*iNotTrash);
|
||||
bNotTrash->set_relief (Gtk::RELIEF_NONE);
|
||||
bNotTrash->set_tooltip_markup (M("FILEBROWSER_SHOWNOTTRASHHINT"));
|
||||
bCateg[18] = bNotTrash->signal_toggled().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::categoryButtonToggled), bNotTrash, true));
|
||||
bNotTrash->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event),false);
|
||||
|
||||
buttonBar->pack_start (*bTrash, Gtk::PACK_SHRINK);
|
||||
buttonBar->pack_start (*bNotTrash, Gtk::PACK_SHRINK);
|
||||
buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
|
||||
fileBrowser->trash_changed().connect( sigc::mem_fun(*this, &FileCatalog::trashChanged) );
|
||||
|
||||
@ -300,6 +311,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
|
||||
// 15 - bRecentlySaved[0]
|
||||
// 16 - bRecentlySaved[1]
|
||||
// 17 - bTrash
|
||||
// 18 - bNotTrash
|
||||
|
||||
categoryButtons[0] = bFilterClear;
|
||||
categoryButtons[1] = bUnRanked;
|
||||
@ -309,6 +321,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
|
||||
for (int i=0; i<2; i++){ categoryButtons[i+13] = bEdited[i];}
|
||||
for (int i=0; i<2; i++){ categoryButtons[i+15] = bRecentlySaved[i];}
|
||||
categoryButtons[17] = bTrash;
|
||||
categoryButtons[18] = bNotTrash;
|
||||
|
||||
exifInfo = Gtk::manage(new Gtk::ToggleButton ());
|
||||
exifInfo->set_image (*Gtk::manage(new RTImage ("info.png")));
|
||||
@ -547,7 +560,7 @@ void FileCatalog::enableTabMode(bool enable) {
|
||||
|
||||
redrawAll();
|
||||
}
|
||||
|
||||
|
||||
void FileCatalog::_refreshProgressBar () {
|
||||
// In tab mode, no progress bar at all
|
||||
// Also mention that this progress bar only measures the FIRST pass (quick thumbnails)
|
||||
@ -589,11 +602,11 @@ int refreshProgressBarUI (void* data) {
|
||||
(static_cast<FileCatalog*>(data))->_refreshProgressBar ();
|
||||
return 0;
|
||||
}
|
||||
|
||||
void FileCatalog::filterApplied() {
|
||||
g_idle_add (refreshProgressBarUI, this);
|
||||
}
|
||||
|
||||
|
||||
void FileCatalog::filterApplied() {
|
||||
g_idle_add (refreshProgressBarUI, this);
|
||||
}
|
||||
|
||||
|
||||
void FileCatalog::previewReady (int dir_id, FileBrowserEntry* fdn) {
|
||||
|
||||
@ -1104,8 +1117,11 @@ void FileCatalog::categoryButtonToggled (Gtk::ToggleButton* b, bool isMouseClick
|
||||
// The event is process here, we can clear modifierKey now, it'll be set again on the next even
|
||||
modifierKey = 0;
|
||||
|
||||
for (int i=0; i<18; i++)
|
||||
bCateg[i].block (true);
|
||||
const int numCateg = sizeof(bCateg) / sizeof(bCateg[0]);
|
||||
const int numButtons = sizeof(categoryButtons) / sizeof(categoryButtons[0]);
|
||||
|
||||
for (int i=0; i<numCateg; i++)
|
||||
bCateg[i].block (true);
|
||||
|
||||
// button already toggled when entering this function from a mouse click, so
|
||||
// we switch it back to its initial state.
|
||||
@ -1120,7 +1136,7 @@ void FileCatalog::categoryButtonToggled (Gtk::ToggleButton* b, bool isMouseClick
|
||||
//we look how many stars are already toggled on, if any
|
||||
int toggled_stars_count=0, buttons=0, start_star=0, toggled_button=0;
|
||||
|
||||
for (int i=0; i<18; i++) {
|
||||
for (int i=0; i<numButtons; i++) {
|
||||
if (categoryButtons[i]->get_active()) {
|
||||
if (i>0 && i<17) {
|
||||
toggled_stars_count ++;
|
||||
@ -1133,8 +1149,14 @@ void FileCatalog::categoryButtonToggled (Gtk::ToggleButton* b, bool isMouseClick
|
||||
|
||||
// if no modifier key is pressed,
|
||||
if (!(control_down || shift_down)) {
|
||||
// if we're deselecting non-trashed
|
||||
if (toggled_button == 18 && (buttons & (1 << toggled_button))) {
|
||||
categoryButtons[0]->set_active (true);
|
||||
for (int i=1; i<numButtons; i++)
|
||||
categoryButtons[i]->set_active (false);
|
||||
}
|
||||
// if we're deselecting the only star still active
|
||||
if (toggled_stars_count == 1 && (buttons & (1 << toggled_button))) {
|
||||
else if (toggled_stars_count == 1 && (buttons & (1 << toggled_button))) {
|
||||
// activate clear-filters
|
||||
categoryButtons[0]->set_active (true);
|
||||
// deactivate the toggled filter
|
||||
@ -1147,11 +1169,11 @@ void FileCatalog::categoryButtonToggled (Gtk::ToggleButton* b, bool isMouseClick
|
||||
}
|
||||
else {
|
||||
// activate the toggled filter, deactivate the rest
|
||||
for (int i=0; i<18; i++)
|
||||
for (int i=0; i<numButtons; i++)
|
||||
categoryButtons[i]->set_active (i==toggled_button);
|
||||
}
|
||||
}
|
||||
//modifier key allowed only for stars and color labels
|
||||
//modifier key allowed only for stars and color labels...
|
||||
else if (toggled_button>0 && toggled_button<17) {
|
||||
if (control_down) {
|
||||
//control is pressed
|
||||
@ -1199,6 +1221,11 @@ void FileCatalog::categoryButtonToggled (Gtk::ToggleButton* b, bool isMouseClick
|
||||
//if more than one star & color label is selected, do nothing
|
||||
}
|
||||
}
|
||||
// ...or non-trashed with Control modifier
|
||||
else if (toggled_button == 18 && control_down)
|
||||
{
|
||||
bNotTrash->set_active (!bNotTrash->get_active ());
|
||||
}
|
||||
|
||||
bool active_now, active_before;
|
||||
|
||||
@ -1261,7 +1288,7 @@ void FileCatalog::categoryButtonToggled (Gtk::ToggleButton* b, bool isMouseClick
|
||||
fileBrowser->setScrollPosition (hScrollPos[lastScrollPos], vScrollPos[lastScrollPos]);
|
||||
}
|
||||
|
||||
for (int i=0; i<18; i++)
|
||||
for (int i=0; i<numCateg; i++)
|
||||
bCateg[i].block (false);
|
||||
}
|
||||
|
||||
@ -1273,29 +1300,30 @@ BrowserFilter FileCatalog::getFilter () {
|
||||
bool anyCLabelFilterActive = bUnCLabeled->get_active () || bCLabel[0]->get_active ()|| bCLabel[1]->get_active ()|| bCLabel[2]->get_active ()|| bCLabel[3]->get_active ()|| bCLabel[4]->get_active ();
|
||||
bool anyEditedFilterActive = bEdited[0]->get_active() || bEdited[1]->get_active();
|
||||
bool anyRecentlySavedFilterActive = bRecentlySaved[0]->get_active() || bRecentlySaved[1]->get_active();
|
||||
const bool nonTrashedActive = bNotTrash->get_active();
|
||||
/*
|
||||
* filter is setup in 2 steps
|
||||
* Step 1: handle individual filters
|
||||
*/
|
||||
filter.showRanked[0] = bFilterClear->get_active() || bUnRanked->get_active () || bTrash->get_active () ||
|
||||
filter.showRanked[0] = bFilterClear->get_active() || bUnRanked->get_active () || bTrash->get_active () || nonTrashedActive ||
|
||||
anyCLabelFilterActive || anyEditedFilterActive || anyRecentlySavedFilterActive;
|
||||
|
||||
filter.showCLabeled[0] = bFilterClear->get_active() || bUnCLabeled->get_active () || bTrash->get_active () ||
|
||||
filter.showCLabeled[0] = bFilterClear->get_active() || bUnCLabeled->get_active () || bTrash->get_active () || nonTrashedActive ||
|
||||
anyRankFilterActive || anyEditedFilterActive || anyRecentlySavedFilterActive;
|
||||
|
||||
for (int i=1; i<=5; i++){
|
||||
filter.showRanked[i] = bFilterClear->get_active() || bRank[i-1]->get_active () || bTrash->get_active () ||
|
||||
filter.showRanked[i] = bFilterClear->get_active() || bRank[i-1]->get_active () || bTrash->get_active () || nonTrashedActive ||
|
||||
anyCLabelFilterActive || anyEditedFilterActive || anyRecentlySavedFilterActive;
|
||||
|
||||
filter.showCLabeled[i] = bFilterClear->get_active() || bCLabel[i-1]->get_active () || bTrash->get_active () ||
|
||||
filter.showCLabeled[i] = bFilterClear->get_active() || bCLabel[i-1]->get_active () || bTrash->get_active () || nonTrashedActive ||
|
||||
anyRankFilterActive || anyEditedFilterActive || anyRecentlySavedFilterActive;
|
||||
}
|
||||
|
||||
for (int i=0; i<2; i++){
|
||||
filter.showEdited[i] = bFilterClear->get_active() || bEdited[i]->get_active () || bTrash->get_active () ||
|
||||
filter.showEdited[i] = bFilterClear->get_active() || bEdited[i]->get_active () || bTrash->get_active () || nonTrashedActive ||
|
||||
anyRankFilterActive || anyCLabelFilterActive || anyRecentlySavedFilterActive;
|
||||
|
||||
filter.showRecentlySaved[i] = bFilterClear->get_active() || bRecentlySaved[i]->get_active () || bTrash->get_active () ||
|
||||
filter.showRecentlySaved[i] = bFilterClear->get_active() || bRecentlySaved[i]->get_active () || bTrash->get_active () || nonTrashedActive ||
|
||||
anyRankFilterActive || anyCLabelFilterActive || anyEditedFilterActive;
|
||||
}
|
||||
if( options.rtSettings.verbose ){
|
||||
@ -1318,7 +1346,8 @@ BrowserFilter FileCatalog::getFilter () {
|
||||
(anyRankFilterActive && anyRecentlySavedFilterActive ) ||
|
||||
(anyCLabelFilterActive && anyEditedFilterActive ) ||
|
||||
(anyCLabelFilterActive && anyRecentlySavedFilterActive ) ||
|
||||
(anyEditedFilterActive && anyRecentlySavedFilterActive)){
|
||||
(anyEditedFilterActive && anyRecentlySavedFilterActive) ||
|
||||
(nonTrashedActive && (anyRankFilterActive || anyCLabelFilterActive || anyEditedFilterActive || anyRecentlySavedFilterActive))){
|
||||
|
||||
filter.multiselect = true;
|
||||
filter.showRanked[0] = anyRankFilterActive?bUnRanked->get_active ():true;
|
||||
@ -1343,7 +1372,7 @@ BrowserFilter FileCatalog::getFilter () {
|
||||
}
|
||||
|
||||
|
||||
filter.showTrash = bFilterClear->get_active() || bTrash->get_active ();
|
||||
filter.showTrash = bTrash->get_active () || !bNotTrash->get_active ();
|
||||
filter.showNotTrash = !bTrash->get_active ();
|
||||
if (!filterPanel)
|
||||
filter.exifFilterEnabled = false;
|
||||
|
||||
@ -105,16 +105,17 @@ class FileCatalog : public Gtk::VBox,
|
||||
Gtk::ToggleButton* bEdited[2];
|
||||
Gtk::ToggleButton* bRecentlySaved[2];
|
||||
Gtk::ToggleButton* bTrash;
|
||||
Gtk::ToggleButton* categoryButtons[18];
|
||||
Gtk::ToggleButton* bNotTrash;
|
||||
Gtk::ToggleButton* categoryButtons[19];
|
||||
Gtk::ToggleButton* exifInfo;
|
||||
sigc::connection bCateg[18];
|
||||
sigc::connection bCateg[19];
|
||||
Gtk::Image* iFilterClear, *igFilterClear;
|
||||
Gtk::Image* iranked[5], *igranked[5], *iUnRanked, *igUnRanked;
|
||||
Gtk::Image* iCLabeled[5], *igCLabeled[5], *iUnCLabeled, *igUnCLabeled;
|
||||
Gtk::Image* iEdited[2], *igEdited[2];
|
||||
Gtk::Image* iRecentlySaved[2], *igRecentlySaved[2];
|
||||
Gtk::Image *iTrashEmpty, *iTrashFull;
|
||||
//Gtk::Image *iRightArrow_red, *iRightArrow;
|
||||
Gtk::Image *iNotTrash;
|
||||
Gtk::Image *iRefreshWhite, *iRefreshRed;
|
||||
Gtk::Image *iLeftPanel_1_Show, *iLeftPanel_1_Hide, *iRightPanel_1_Show, *iRightPanel_1_Hide;
|
||||
Gtk::Image *iQueryClear;
|
||||
|
||||
1
tools/source_icons/scalable/trash-hide-deleted.file
Normal file
1
tools/source_icons/scalable/trash-hide-deleted.file
Normal file
@ -0,0 +1 @@
|
||||
trash-hide-deleted.png,w22,actions
|
||||
182
tools/source_icons/scalable/trash-hide-deleted.svg
Normal file
182
tools/source_icons/scalable/trash-hide-deleted.svg
Normal file
@ -0,0 +1,182 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="1000"
|
||||
height="1000"
|
||||
id="svg2"
|
||||
sodipodi:version="0.32"
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="hidedeleted_1.svg"
|
||||
inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/gtk-zoom-fit.png"
|
||||
inkscape:export-xdpi="1.8"
|
||||
inkscape:export-ydpi="1.8"
|
||||
version="1.1">
|
||||
<defs
|
||||
id="defs4" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.07327394"
|
||||
inkscape:cx="-727.48647"
|
||||
inkscape:cy="-1036.9108"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="g4060"
|
||||
showguides="true"
|
||||
inkscape:guide-bbox="true"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1032"
|
||||
inkscape:window-x="-1"
|
||||
inkscape:window-y="0"
|
||||
showgrid="true"
|
||||
showborder="true"
|
||||
inkscape:showpageshadow="true"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:snap-bbox="true"
|
||||
inkscape:bbox-paths="true"
|
||||
inkscape:bbox-nodes="true"
|
||||
inkscape:snap-bbox-edge-midpoints="false"
|
||||
inkscape:snap-bbox-midpoints="false"
|
||||
inkscape:object-paths="false"
|
||||
inkscape:snap-intersection-paths="false"
|
||||
inkscape:snap-object-midpoints="false"
|
||||
inkscape:snap-center="false"
|
||||
inkscape:snap-text-baseline="false"
|
||||
inkscape:snap-grids="false"
|
||||
inkscape:snap-global="true"
|
||||
inkscape:snap-to-guides="false"
|
||||
inkscape:snap-page="true"
|
||||
inkscape:snap-smooth-nodes="true"
|
||||
inkscape:object-nodes="true"
|
||||
inkscape:snap-nodes="false">
|
||||
<inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid4431" />
|
||||
</sodipodi:namedview>
|
||||
<metadata
|
||||
id="metadata7">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(464.16179,464.03236)">
|
||||
<g
|
||||
id="g4082"
|
||||
transform="translate(0,1.552561)">
|
||||
<g
|
||||
id="g4060"
|
||||
transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)"
|
||||
style="display:inline">
|
||||
<g
|
||||
id="g11601"
|
||||
transform="translate(-2044.9008,-123.75958)">
|
||||
<g
|
||||
id="g11596">
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-opacity:1"
|
||||
id="path8"
|
||||
d="m -29.654973,453.77437 c -12.406775,6.28192 -20.416212,17.27526 -22.143737,29.99613 l -1.099336,7.38124 82.921233,0 82.921233,0 -1.09934,-6.43895 c -1.41343,-9.10878 -7.85239,-21.0444 -13.977249,-25.59879 -11.307441,-8.63763 -12.563823,-8.79468 -68.943979,-8.79468 -49.784149,0.15705 -52.611009,0.31409 -58.578825,3.45505 z" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-opacity:1"
|
||||
id="path10"
|
||||
d="m -152.93749,512.66729 c -21.51554,3.6121 -41.77471,16.80411 -54.49558,35.17871 -6.43896,9.26582 -13.03496,28.73975 -13.03496,38.16261 l 0,7.2242 250.491217,0 250.491213,0 0,-5.49667 c 0,-32.98004 -29.36794,-67.05941 -64.07549,-74.44065 -5.81076,-1.2564 -60.7775,-1.72753 -186.886867,-1.57048 -98.154868,0.15704 -180.290863,0.62818 -182.489533,0.94228 z" />
|
||||
<path
|
||||
id="path5310"
|
||||
d="m -184.34235,615.21019 0,93.60467 0,24.30324 c 0,147.31083 0.6241,232.90809 1.5664,238.24771 3.92619,20.88735 18.06333,39.27919 37.22317,48.85909 l 10.68368,5.1735 144.5212519,0 c -22.2155189,-16.3208 -42.3571829,-35.50068 -60.8578729,-53.55192 -7.54126,-7.35805 -14.722537,-14.7002 -21.471019,-21.83249 -4.824957,6.54742 -12.594128,10.78086 -21.388099,10.78086 -14.696011,0 -26.513571,-11.81629 -26.513571,-26.51228 l 0,-39.32467 c -5.15343,-6.46118 -8.05228,-10.31832 -8.05228,-10.31832 a 41.745522,41.745522 0 0 1 -0.15418,-49.963 c 0,0 2.94905,-3.97673 8.20646,-10.64481 l 0,-117.7058 c 0,-14.696 11.81756,-26.51357 26.513571,-26.51357 14.696002,0 26.539488,11.81757 26.539488,26.51357 l 0,56.57973 c 5.128656,-5.37695 10.48363,-10.8419 16.029411,-16.31315 17.215548,-16.98417 35.863225,-34.96056 56.3050579,-50.67559 3.8578353,-9.06886 12.6163101,-15.51329 22.9855971,-16.0644 27.069306,-16.93234 57.123355,-28.53603 90.885165,-28.53603 48.25226,0 88.9303,23.69859 124.14244,52.79134 l 0,-88.89768 -213.581691,0 -213.582979,0 z"
|
||||
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-opacity:1"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
id="path21157"
|
||||
d="m 118.67923,693.0598 c -90.365994,0 -213.94691,166.49562 -213.94691,166.49562 0,0 123.920737,164.83068 213.94691,164.83068 90.02613,0 213.94682,-164.83068 213.94682,-164.83068 0,0 -123.58096,-166.49562 -213.94682,-166.49562 z m -9e-4,30.80169 c 74.18607,0 134.86307,60.67696 134.86307,134.86307 0,74.18611 -60.677,134.85982 -134.86307,134.85982 -74.186025,0 -134.859824,-60.67371 -134.859824,-134.85982 0,-74.18611 60.673799,-134.86307 134.859824,-134.86307 z m 0,49.94706 c -47.191762,0 -84.91109,37.72418 -84.91109,84.91601 0,47.19184 37.719328,84.91114 84.91109,84.91114 47.19185,0 84.91606,-37.7193 84.91606,-84.91114 0,-47.19183 -37.72421,-84.91601 -84.91606,-84.91601 z"
|
||||
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32671511;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate" />
|
||||
</g>
|
||||
<g
|
||||
id="g11608"
|
||||
transform="translate(-23.341608,-6.1754939e-5)">
|
||||
<g
|
||||
id="g11503"
|
||||
transform="translate(7.3871513e-7,-1.1978249e-6)">
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-opacity:1"
|
||||
id="path8-4"
|
||||
d="m -29.654976,-249.38459 c -12.406775,6.28192 -20.416212,17.27526 -22.143737,29.99613 l -1.099336,7.38124 82.921233,0 82.921236,0 -1.09934,-6.43895 c -1.41343,-9.10878 -7.85239,-21.0444 -13.977252,-25.59879 -11.307441,-8.63763 -12.563823,-8.79468 -68.943979,-8.79468 -49.784149,0.15705 -52.611009,0.31409 -58.578825,3.45505 z" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-opacity:1"
|
||||
id="path10-2"
|
||||
d="m -152.93749,-190.49167 c -21.51554,3.6121 -41.77471,16.80411 -54.49558,35.17871 -6.43896,9.26582 -13.03496,28.73975 -13.03496,38.16261 l 0,7.2242 250.491214,0 250.491216,0 0,-5.49667 c 0,-32.98004 -29.36794,-67.05941 -64.07549,-74.44065 -5.81076,-1.2564 -60.7775,-1.72753 -186.88687,-1.57048 -98.154868,0.15704 -180.29086,0.62818 -182.48953,0.94228 z" />
|
||||
<path
|
||||
id="path5310-1"
|
||||
transform="matrix(0.66335753,0,0,0.66335753,-301.65558,-296.97895)"
|
||||
d="m 176.84766,315.10938 0,141.10742 0,36.63672 c 0,222.06852 0.94082,351.10491 2.36132,359.15429 5.91867,31.48732 27.23017,59.21275 56.11329,73.6543 l 16.10546,7.79883 248.57227,0 66.62891,0 -9.65235,-9.65235 a 58.107594,58.107594 0 0 1 -0.18945,-0.1914 c -26.38774,-26.63391 -26.38298,-71.2667 -0.008,-97.89649 a 58.107594,58.107594 0 0 1 0.19726,-0.19726 l 68.77735,-68.77735 -68.77735,-68.77929 a 58.107594,58.107594 0 0 1 -0.18945,-0.19141 c -9.18727,-9.27298 -15.16682,-20.72459 -17.95899,-32.83594 l 0,141.16602 c 0,22.15396 -17.85384,39.9668 -40.00781,39.9668 -22.15397,0 -40.00976,-17.81284 -40.00976,-39.9668 l 0,-343.64063 c 0,-22.15397 17.85579,-39.96875 40.00976,-39.96875 22.15397,0 40.00781,17.81478 40.00781,39.96875 l 0,170.23828 c 2.7917,-12.1081 8.76826,-23.5566 17.94922,-32.82617 a 58.107594,58.107594 0 0 1 0.19727,-0.19726 l 47.23047,-47.23047 a 58.107594,58.107594 0 0 1 0.1914,-0.1875 c 11.14217,-11.03917 25.57231,-17.68421 40.29493,-19.57031 l 0,-70.22657 c 0,-22.15397 17.8558,-39.96875 40.00976,-39.96875 22.15398,0 39.9668,17.81478 39.9668,39.96875 l 0,112.16016 46.60351,46.60352 49.51563,-49.51758 c 10e-4,-20.67604 0.004,-39.1495 0.004,-62.91406 l 0,-42.58008 0,-141.10742 -321.97071,0 -321.97265,0 z m 136.09179,97.38671 c 22.15397,0 40.00782,17.81478 40.00782,39.96875 l 0,343.64063 c 0,22.15396 -17.85385,39.9668 -40.00782,39.9668 -22.15397,0 -39.96875,-17.81284 -39.96875,-39.9668 l 0,-343.64063 c 0,-22.15397 17.81478,-39.96875 39.96875,-39.96875 z m 458.34961,489.78321 -31.18164,31.18164 8.46485,0 13.02734,-6.15625 c 7.77178,-3.71395 14.93943,-8.19203 21.4043,-13.31055 L 771.28906,902.2793 Z"
|
||||
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-opacity:1"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<path
|
||||
id="path1468-9-2-0-9-7"
|
||||
d="m 126.40273,90.113835 c 2.95981,-2.93246 7.7306,-2.93216 10.69075,-10e-6 l 72.87856,72.878555 72.87858,-72.878585 c 1.81297,-1.89687 4.47753,-2.72434 7.04613,-2.18671 1.39827,0.36746 2.66302,1.12604 3.64462,2.1867 l 31.34328,31.343285 c 2.93235,2.95984 2.93182,7.73071 -1e-5,10.69075 l -72.87858,72.87858 72.87856,72.87857 c 2.93236,2.95984 2.93183,7.73058 -2e-5,10.69074 l -31.33049,31.33049 c -2.95998,2.93224 -7.73061,2.9322 -10.69072,0 l -72.87857,-72.87856 -72.87856,72.87856 c -2.95999,2.93224 -7.73062,2.93208 -10.69074,0 L 95.07225,288.58292 c -2.932427,-2.95979 -2.931857,-7.73058 0,-10.69074 L 167.9508,205.01361 95.07226,132.13506 c -2.932427,-2.95979 -2.931817,-7.73063 -1e-5,-10.69073 l 31.33048,-31.330495 z"
|
||||
style="opacity:0.7;fill:#aa0000;fill-opacity:1;stroke:#000000;stroke-width:0.22918391;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<g
|
||||
id="g11568"
|
||||
transform="translate(0,-1406.3194)">
|
||||
<g
|
||||
id="g11570"
|
||||
transform="translate(0,703.15896)">
|
||||
<g
|
||||
id="g11572">
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-opacity:1"
|
||||
id="path11574"
|
||||
d="m -29.654973,-249.38459 c -12.406775,6.28192 -20.416212,17.27526 -22.143737,29.99613 l -1.099336,7.38124 82.921233,0 82.921233,0 -1.09934,-6.43895 c -1.41343,-9.10878 -7.85239,-21.0444 -13.977249,-25.59879 -11.307441,-8.63763 -12.563823,-8.79468 -68.943979,-8.79468 -49.784149,0.15705 -52.611009,0.31409 -58.578825,3.45505 z" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-opacity:1"
|
||||
id="path11576"
|
||||
d="m -152.93749,-190.49167 c -21.51554,3.6121 -41.77471,16.80411 -54.49558,35.17871 -6.43896,9.26582 -13.03496,28.73975 -13.03496,38.16261 l 0,7.2242 250.491217,0 250.491213,0 0,-5.49667 c 0,-32.98004 -29.36794,-67.05941 -64.07549,-74.44065 -5.81076,-1.2564 -60.7775,-1.72753 -186.886867,-1.57048 -98.154868,0.15704 -180.290863,0.62818 -182.489533,0.94228 z" />
|
||||
<path
|
||||
id="path11578"
|
||||
transform="matrix(0.66335753,0,0,0.66335753,-301.65558,-296.97895)"
|
||||
d="m 176.84766,315.10938 0,141.10742 0,36.63672 c 0,222.06852 0.94082,351.10491 2.36132,359.15429 5.91867,31.48732 27.23017,59.21275 56.11329,73.6543 l 16.10546,7.79883 217.86329,0 c -33.48951,-24.60322 -63.85272,-53.51659 -91.74219,-80.72852 -11.36832,-11.09213 -22.19397,-22.1603 -32.36719,-32.91211 -7.27354,9.87013 -18.98543,16.25196 -32.24219,16.25196 -22.15398,0 -39.96875,-17.81284 -39.96875,-39.9668 l 0,-59.28125 c -7.76871,-9.74012 -12.13867,-15.55469 -12.13867,-15.55469 a 62.930652,62.930652 0 0 1 -0.23242,-75.31836 c 0,0 4.44564,-5.99485 12.37109,-16.04687 l 0,-177.43946 c 0,-22.15397 17.81477,-39.96875 39.96875,-39.96875 22.15397,0 40.00782,17.81478 40.00782,39.96875 l 0,85.29297 c 7.73136,-8.10566 15.80389,-16.34398 24.16406,-24.59179 25.95214,-25.60335 54.06319,-52.70244 84.8789,-76.39258 5.81562,-13.67115 19.01887,-23.38601 34.65039,-24.2168 40.80651,-25.52521 86.11247,-43.01758 137.00782,-43.01758 72.73944,0 134.06089,35.72522 187.14258,79.58203 l 0,-134.01171 -321.97071,0 -321.97265,0 z"
|
||||
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-opacity:1"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
id="path11580"
|
||||
d="m 118.67923,-10.09916 c -90.365994,0 -213.94691,166.49562 -213.94691,166.49562 0,0 123.920737,164.83065 213.94691,164.83065 90.02613,0 213.94682,-164.83065 213.94682,-164.83065 0,0 -123.58096,-166.49562 -213.94682,-166.49562 z m -9e-4,30.801688 c 74.18607,0 134.86307,60.67696 134.86307,134.863072 0,74.18611 -60.677,134.85982 -134.86307,134.85982 -74.186025,0 -134.859824,-60.67371 -134.859824,-134.85982 0,-74.186112 60.673799,-134.863072 134.859824,-134.863072 z m 0,49.947065 c -47.191762,0 -84.91109,37.724177 -84.91109,84.916007 0,47.19184 37.719328,84.91114 84.91109,84.91114 47.19185,0 84.91606,-37.7193 84.91606,-84.91114 0,-47.19183 -37.72421,-84.916007 -84.91606,-84.916007 z"
|
||||
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32671511;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 14 KiB |
Loading…
x
Reference in New Issue
Block a user