# HG changeset patch # User David Bryant # Date 1304519681 -34200 # Node ID 46e6dd7dce2e3e640a6e013094db6e6882fcfe33 # Parent 0d427170a805b0c5dc98a8908760f863410b4778 Beginnings of some documentation, and miscellaneous tweaks. diff -r 0d427170a805 -r 46e6dd7dce2e doodle/gtk/data/ellipse.svg --- a/doodle/gtk/data/ellipse.svg Wed May 04 22:19:44 2011 +0930 +++ b/doodle/gtk/data/ellipse.svg Thu May 05 00:04:41 2011 +0930 @@ -14,7 +14,7 @@ height="32px" id="svg2383" sodipodi:version="0.32" - inkscape:version="0.47 r22583" + inkscape:version="0.48+devel r10195" sodipodi:docname="ellipse.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/daveb/source/d/doodle/doodle/gtk/data/rectangle.png" @@ -119,18 +119,26 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.9180417" - inkscape:cx="-4.0005236" - inkscape:cy="17.592423" + inkscape:zoom="26.21875" + inkscape:cx="16" + inkscape:cy="16" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:window-width="1196" - inkscape:window-height="880" - inkscape:window-x="157" - inkscape:window-y="98" - inkscape:window-maximized="0" /> + inkscape:window-width="1680" + inkscape:window-height="1026" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1"> + + @@ -149,13 +157,13 @@ inkscape:groupmode="layer"> diff -r 0d427170a805 -r 46e6dd7dce2e doodle/gtk/data/polyline.svg --- a/doodle/gtk/data/polyline.svg Wed May 04 22:19:44 2011 +0930 +++ b/doodle/gtk/data/polyline.svg Thu May 05 00:04:41 2011 +0930 @@ -14,7 +14,7 @@ height="32px" id="svg2383" sodipodi:version="0.32" - inkscape:version="0.47 r22583" + inkscape:version="0.48+devel r10195" sodipodi:docname="polyline.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/daveb/source/d/doodle/doodle/gtk/data/ellipse.png" @@ -119,18 +119,26 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.9180417" - inkscape:cx="-26.607123" - inkscape:cy="17.592423" + inkscape:zoom="26.21875" + inkscape:cx="16" + inkscape:cy="16" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:window-width="1196" - inkscape:window-height="880" - inkscape:window-x="157" - inkscape:window-y="98" - inkscape:window-maximized="0" /> + inkscape:window-width="1680" + inkscape:window-height="1026" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1"> + + @@ -148,7 +156,7 @@ inkscape:label="Layer 1" inkscape:groupmode="layer"> diff -r 0d427170a805 -r 46e6dd7dce2e doodle/gtk/data/rectangle.svg --- a/doodle/gtk/data/rectangle.svg Wed May 04 22:19:44 2011 +0930 +++ b/doodle/gtk/data/rectangle.svg Thu May 05 00:04:41 2011 +0930 @@ -14,7 +14,7 @@ height="32px" id="svg2383" sodipodi:version="0.32" - inkscape:version="0.47 r22583" + inkscape:version="0.48+devel r10195" sodipodi:docname="rectangle.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/daveb/source/d/doodle/doodle/gtk/data/rectangle.png" @@ -110,18 +110,26 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.9180417" - inkscape:cx="-10.567804" - inkscape:cy="15.571721" + inkscape:zoom="26.21875" + inkscape:cx="16" + inkscape:cy="16" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:window-width="1196" - inkscape:window-height="880" - inkscape:window-x="346" - inkscape:window-y="89" - inkscape:window-maximized="0" /> + inkscape:window-width="1680" + inkscape:window-height="1026" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1"> + + @@ -130,7 +138,7 @@ image/svg+xml - + @@ -139,12 +147,12 @@ inkscape:label="Layer 1" inkscape:groupmode="layer"> diff -r 0d427170a805 -r 46e6dd7dce2e doodle/gtk/data/select.svg --- a/doodle/gtk/data/select.svg Wed May 04 22:19:44 2011 +0930 +++ b/doodle/gtk/data/select.svg Thu May 05 00:04:41 2011 +0930 @@ -1,5 +1,6 @@ + diff -r 0d427170a805 -r 46e6dd7dce2e nobuild/doc/development.rst --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/nobuild/doc/development.rst Thu May 05 00:04:41 2011 +0930 @@ -0,0 +1,33 @@ +================== +Doodle Development +================== + +Introduction +============ + +Objectives +---------- + +Build Tool +---------- + +Directory Organisation +---------------------- + +Crucial Design Aspects +====================== + +Tool Stack +---------- + +Interaction, event handling, etc. + +Undo Framework +-------------- + +Drawing Abstraction +------------------- + +Detailed Component Descriptions +=============================== + diff -r 0d427170a805 -r 46e6dd7dce2e nobuild/dot-bashrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/nobuild/dot-bashrc Thu May 05 00:04:41 2011 +0930 @@ -0,0 +1,218 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +[ -z "$PS1" ] && return + +# don't put duplicate lines in the history. See bash(1) for more options +# ... or force ignoredups and ignorespace +HISTCONTROL=ignoredups:ignorespace + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# some more ls aliases +#alias ll='ls -alF' +#alias la='ls -A' +#alias l='ls -CF' + +# Add an "alert" alias for long running commands. Use like so: +# sleep 10; alert +alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if [ -f /etc/bash_completion ] && ! shopt -oq posix; then + . /etc/bash_completion +fi + +alias mv='mv -i' +alias cp='cp -i' +alias ls='ls --color=auto' +alias grep='grep --color=auto' +#alias w2do='w2do --colour' +alias word='wine /home/daveb/.wine/drive_c/Program\ Files/Microsoft\ Office/OFFICE11/WINWORD.EXE > /dev/null 2>&1' +alias mr='mr -ptq' + +setup_local() { + local LOCAL=$1 + shift + PATH="${LOCAL}/bin:${PATH}" + + for i in $*; do + case "$i" in + pk) + export PKG_CONFIG_PATH="${LOCAL}/lib/pkgconfig:${PKG_CONFIG_PATH}" + ;; + ld) + export LD_LIBRARY_PATH="${LOCAL}/lib:${LD_LIBRARY_PATH}" + ;; + py) + export PYTHONPATH="${LOCAL}/lib/python2.6/site-packages:${PYTHONPATH}" + ;; + ac) + export ACLOCAL_FLAGS="-I ${LOCAL}/share/aclocal ${ACLOCAL_FLAGS}" + ;; + *) + echo "Unhandled flag in setup_local: $i" + ;; + esac + done +} + +setup_local "${HOME}/local/inkscape" ld +#setup_local "${HOME}/local/wine" +#setup_local "${HOME}/local/gimp" +#setup_local "/opt/acacia/ace" +#setup_local "${HOME}/local/gstreamer" +#setup_local "${HOME}/local/e" +#setup_local "/opt/acacia/legacy/aesop" +#setup_local "/opt/acacia/legacy/eugene-1.0" +#setup_local "/opt/acacia/legacy/scimers" +PATH="${HOME}/source/d/dmd/bin:${PATH}" +#PATH="/opt/Adobe/Reader9/bin:${PATH}" + +export EDITOR="vim" +#export CC="colorgcc" + +# ACE/TAO support + +#export ACE_ROOT="/opt/acacia/ace" +#export TAO_ROOT="${ACE_ROOT}/TAO" +#export LD_LIBRARY_PATH="${ACE_ROOT}/lib:${LD_LIBRARY_PATH}" +#export CPATH="${ACE_ROOT}/include" +#PATH="${ACE_ROOT}/bin:${PATH}" + +# Android support +#PATH=${PATH}:${HOME}/android-sdk-linux_86/tools + +# +# Functions +# + +# Support for setting the title of the terminal tab +# This is broken: +function title() { + unset PROMPT_COMMAND + echo -ne "\033]0;$1\007" +} + +function real_loc() { + find $* $ \ + -name \*.d -o \ + -name \*.h -o -name \*.cxx -o -name \*.C -o \ + -name \*.c -o -name \*.cc -o -name \*.idl -o \ + -name \*.cpp -o -name \*.java -o -name \*.ipc -o \ + -name \*.hpp \ + $ \ + -print0 | xargs --null cat | grep -v "^$" | wc -l +} + +function loc() { + if [ $# -eq 0 ]; then + real_loc "." + else + real_loc $* + fi +} + +# Output a copy of $1 with duplicates removed +# Note: subsequent copies are removed, otherwise order is preserved. +# 1. the path to remove duplicates from +function remove_duplicates() { + local original="${1}" + local IFS=':' + local result="" + for item in ${original}; do + if [ -z "$item" ]; then + continue + fi + local -i found_existing=0 + for existing in ${result}; do + if [ "${item}" == "${existing}" ]; then + found_existing=1 + break 1 + fi + done + if [ ${found_existing} -eq 0 ]; then + result="${result:+${result}:}${item}" + fi + done + echo "${result}" +} diff -r 0d427170a805 -r 46e6dd7dce2e nobuild/undo_manager.d --- a/nobuild/undo_manager.d Wed May 04 22:19:44 2011 +0930 +++ b/nobuild/undo_manager.d Thu May 05 00:04:41 2011 +0930 @@ -1,7 +1,5 @@ module doodle.main.undo_manager; -version(none) { - class UndoManager : IUndoManager { this() { } @@ -152,5 +150,3 @@ Set!(IUndoObserver) _observers; } } - -}