Skip to content

Commit

Permalink
Merge pull request #208 from juliandescottes/feature-export-to-file
Browse files Browse the repository at this point in the history 
Feature export to file
  • Loading branch information
@juliandescottes
juliandescottes committed Jul 14, 2014
2 parents 2fabf68 + c1900a0 commit 280dd1a
Show file tree
Hide file tree
Showing 67 changed files with 1,526 additions and 786 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ diff.txt

# build destination
dest
build/closure/closure_compiled_binary.js

# marked as private
*.private.*
18 changes: 3 additions & 15 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,6 @@ module.exports = function(grunt) {
{expand: true, flatten: true, src: ['src/piskel-boot-0.1.0.js'], dest: 'dest/'}
]
},
index: {
options: {
patterns: [
{
match: /templates\//g,
replacement: "templates"+version+"/"
}
]
},
files: [
{src: ['src/index.html'], dest: 'dest/index.html'}
]
},
editor: {
options: {
patterns: [
Expand Down Expand Up @@ -190,9 +177,10 @@ module.exports = function(grunt) {
{src: ['dest/js/piskel-packaged-min.js'], dest: 'dest/js/piskel-packaged-min' + version + '.js'},
{src: ['src/logo.png'], dest: 'dest/logo.png'},
{src: ['src/js/lib/iframeLoader-0.1.0.js'], dest: 'dest/js/lib/iframeLoader-0.1.0.js'},
{src: ['src/js/lib/gif/gif.ie.worker.js'], dest: 'dest/js/lib/gif/gif.ie.worker.js'},
{expand: true, src: ['img/**'], cwd: 'src/', dest: 'dest/', filter: 'isFile'},
{expand: true, src: ['css/fonts/**'], cwd: 'src/', dest: 'dest/', filter: 'isFile'},
{expand: true, src: ['**/*.html'], cwd: 'src/templates/', dest: 'dest/templates/', filter: 'isFile'}
{expand: true, src: ['**/*.html'], cwd: 'src/', dest: 'dest/', filter: 'isFile'}
]
}
},
Expand Down Expand Up @@ -299,7 +287,7 @@ module.exports = function(grunt) {
// Compile JS code (eg verify JSDoc annotation and types, no actual minified code generated).
grunt.registerTask('compile', ['closureCompiler:compile', 'clean:after']);

grunt.registerTask('rep', ['replace:main', 'replace:index', 'replace:editor']);
grunt.registerTask('rep', ['replace:main', 'replace:editor']);

grunt.registerTask('merge', ['concat:js', 'concat:css', 'uglify', 'rep', 'copy']);

Expand Down
47 changes: 47 additions & 0 deletions misc/selenium-ide/change-colors.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="http://localhost:9901/?debug" />
<title>change-colors</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">change-colors</td></tr>
</thead><tbody>
<tr>
<td>open</td>
<td>/?debug</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>css=div.sp-preview-inner</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>css=input.sp-input</td>
<td></td>
</tr>
<tr>
<td>type</td>
<td>css=input.sp-input</td>
<td>rgb(170, 187, 204)</td>
</tr>
<tr>
<td>mouseDown</td>
<td>id=preview-list-scroller</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>css=div.swap-colors-icon</td>
<td></td>
</tr>

</tbody></table>
</body>
</html>
52 changes: 52 additions & 0 deletions misc/selenium-ide/change-size.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="http://localhost:9901/?debug" />
<title>change-size</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">change-size</td></tr>
</thead><tbody>
<tr>
<td>open</td>
<td>/?debug</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>css=div.tool-icon.resize-icon</td>
<td></td>
</tr>
<tr>
<td>type</td>
<td>name=resize-width</td>
<td>64</td>
</tr>
<tr>
<td>type</td>
<td>name=resize-height</td>
<td>64</td>
</tr>
<tr>
<td>click</td>
<td>name=resize-content-checkbox</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//input[@value='Resize']</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>id=column-wrapper</td>
<td></td>
</tr>

</tbody></table>
</body>
</html>
82 changes: 82 additions & 0 deletions misc/selenium-ide/select-tools.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="http://localhost:9901/?debug" />
<title>Select tools</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">Select tools</td></tr>
</thead><tbody>
<tr>
<td>open</td>
<td>/?debug</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[2]</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[3]</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[4]</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[5]</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[6]</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[7]</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[8]</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[9]</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[10]</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[11]</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[12]</td>
<td></td>
</tr>
<tr>
<td>mouseDown</td>
<td>//ul[@id='tools-container']/li[13]</td>
<td></td>
</tr>

</tbody></table>
</body>
</html>
92 changes: 92 additions & 0 deletions misc/selenium-ide/user-preferences.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="http://localhost:9901/?debug" />
<title>user-preferences</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">user-preferences</td></tr>
</thead><tbody>
<tr>
<td>open</td>
<td>/?debug</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>css=div.tool-icon.gear-icon</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>css=div.background-picker.lowcont-medium-picker-background</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>css=div.background-picker.medium-picker-background</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>css=div.background-picker.light-picker-background</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>id=grid-width</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>id=grid-width</td>
<td>label=Enabled - 1px wide</td>
</tr>
<tr>
<td>click</td>
<td>css=option[value=&quot;1&quot;]</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>id=grid-width</td>
<td>label=Enabled - 2px wide</td>
</tr>
<tr>
<td>click</td>
<td>css=option[value=&quot;2&quot;]</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>id=grid-width</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>id=grid-width</td>
<td>label=Enabled - 3px wide</td>
</tr>
<tr>
<td>click</td>
<td>css=option[value=&quot;3&quot;]</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>id=grid-width</td>
<td>label=Enabled - 4px wide</td>
</tr>
<tr>
<td>click</td>
<td>css=option[value=&quot;4&quot;]</td>
<td></td>
</tr>

</tbody></table>
</body>
</html>
38 changes: 38 additions & 0 deletions src/css/dialogs-browse-local.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@

/************************************************************************************************/
/* Browse local piskels panel */
/************************************************************************************************/

.local-piskel-list {
width: 100%;
}

.local-piskel-item {
height: 3em;
}

.local-piskel-name {
width: 40%;
}

.local-piskel-save-date {
font-weight : normal;
}

.local-piskel-list a {
text-decoration: none;
}

.local-piskel-list a:hover {
text-decoration: underline;
}

.local-piskel-list-head {
font-weight: bold;
color: gold;
}

.local-piskel-load-button,
.local-piskel-delete-button {
width : 75px;
}

0 comments on commit 280dd1a

Please sign in to comment.